Replacing att.com namespace 53/57653/3
authorFiachra Corcoran <fiachra.corcoran@ericsson.com>
Thu, 26 Jul 2018 06:23:34 +0000 (07:23 +0100)
committerFiachra Corcoran <fiachra.corcoran@ericsson.com>
Mon, 30 Jul 2018 08:12:50 +0000 (09:12 +0100)
Issue-ID: DMAAP-52
Change-Id: Ia6d5c1725119b893c50fed13c2c2d6fd47f4f917
Signed-off-by: Fiachra Corcoran <fiachra.corcoran@ericsson.com>
34 files changed:
.gitignore [new file with mode: 0644]
datarouter-node/pom.xml
datarouter-node/src/main/resources/docker/startup.sh
datarouter-node/src/main/resources/logback.xml
datarouter-node/src/main/resources/misc/doaction
datarouter-node/src/main/resources/misc/drtrnode
datarouter-prov/pom.xml
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/authz/impl/package.html
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/BaseServlet.java
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/InternalServlet.java
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/Main.java
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/SynchronizerTask.java
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/IngressRoute.java
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/package.html
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRRouteCLI.java
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/PurgeLogDirTask.java
datarouter-prov/src/main/java/org/onap/dmaap/datarouter/reports/package.html
datarouter-prov/src/main/resources/docker-compose/docker-compose.yml
datarouter-prov/src/main/resources/docker-compose/prov_data/provserver.properties
datarouter-prov/src/main/resources/docker/startup.sh
datarouter-prov/src/main/resources/log4j.properties
datarouter-prov/src/main/resources/logback.xml
datarouter-prov/src/main/resources/misc/doaction
datarouter-prov/src/main/resources/misc/dr-route
datarouter-prov/src/main/resources/misc/drtrprov
datarouter-prov/src/main/resources/misc/log4j.drroute.properties
datarouter-prov/src/main/resources/misc/log4j.properties.tmpl
datarouter-prov/src/main/resources/misc/provcmd
datarouter-prov/src/main/resources/misc/runreports
datarouter-prov/src/main/resources/provserver.properties
pom.xml

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..96f5bf7
--- /dev/null
@@ -0,0 +1,3 @@
+*.iml
+.idea
+**/target/
\ No newline at end of file
index f43fbd1..b4b5a8e 100644 (file)
   * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
   *\r
 -->\r
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-         <modelVersion>4.0.0</modelVersion>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+       <modelVersion>4.0.0</modelVersion>\r
        <parent>\r
                <groupId>org.onap.dmaap.datarouter</groupId>\r
                <artifactId>parent</artifactId>\r
                <version>1.0.1-SNAPSHOT</version>\r
                <relativePath>../pom.xml</relativePath>\r
        </parent>\r
-       \r
\r
        <artifactId>datarouter-node</artifactId>\r
        <packaging>jar</packaging>\r
        <name>datarouter-node</name>\r
        <url>https://github.com/att/DMAAP_DATAROUTER</url>\r
-\r
-\r
-\r
        <properties>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <maven.compiler.source>1.8</maven.compiler.source>\r
                <maven.compiler.target>1.8</maven.compiler.target>\r
-               <dockerLocation>${basedir}/target/</dockerLocation>\r
+               <docker.location>${basedir}/target/</docker.location>\r
                <sonar.language>java</sonar.language>\r
-                       <sonar.skip>false</sonar.skip>\r
+               <sonar.skip>false</sonar.skip>\r
                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
                <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
@@ -57,7 +51,6 @@
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
                <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
        </properties>\r
-       \r
        <dependencies>\r
                <dependency>\r
                        <groupId>junit</groupId>\r
@@ -70,7 +63,6 @@
                        <artifactId>json</artifactId>\r
                        <version>20160810</version>\r
                </dependency>\r
-\r
                <dependency>\r
                        <groupId>javax.mail</groupId>\r
                        <artifactId>javax.mail-api</artifactId>\r
                        <artifactId>servlet-api</artifactId>\r
                        <version>2.5</version>\r
                </dependency>\r
-                <dependency>\r
-            <groupId>com.thoughtworks.xstream</groupId>\r
-            <artifactId>xstream</artifactId>\r
-            <version>1.4.7</version>\r
-        </dependency>\r
-       <dependency>\r
-               <groupId>ch.qos.logback</groupId>\r
-               <artifactId>logback-classic</artifactId>\r
-               <version>1.2.0</version>\r
-               <scope>compile</scope>\r
-       </dependency>\r
-       <dependency>\r
-               <groupId>ch.qos.logback</groupId>\r
-               <artifactId>logback-core</artifactId>\r
-               <version>1.2.0</version>\r
-               <scope>compile</scope>\r
-       </dependency>\r
-\r
+               <dependency>\r
+                       <groupId>com.thoughtworks.xstream</groupId>\r
+                       <artifactId>xstream</artifactId>\r
+                       <version>1.4.7</version>\r
+               </dependency>\r
+               <dependency>\r
+                       <groupId>ch.qos.logback</groupId>\r
+                       <artifactId>logback-classic</artifactId>\r
+                       <version>1.2.0</version>\r
+                       <scope>compile</scope>\r
+               </dependency>\r
+               <dependency>\r
+                       <groupId>ch.qos.logback</groupId>\r
+                       <artifactId>logback-core</artifactId>\r
+                       <version>1.2.0</version>\r
+                       <scope>compile</scope>\r
+               </dependency>\r
                <dependency>\r
                        <groupId>org.eclipse.jetty</groupId>\r
                        <artifactId>jetty-server</artifactId>\r
                        <artifactId>jetty-http</artifactId>\r
                        <version>7.6.14.v20131031</version>\r
                </dependency>\r
-\r
                <dependency>\r
                        <groupId>org.eclipse.jetty</groupId>\r
                        <artifactId>jetty-security</artifactId>\r
                        <version>7.6.14.v20131031</version>\r
                </dependency>\r
-\r
                <dependency>\r
                        <groupId>org.eclipse.jetty</groupId>\r
                        <artifactId>jetty-websocket</artifactId>\r
                        <version>7.6.14.v20131031</version>\r
                </dependency>\r
-\r
                <dependency>\r
                        <groupId>org.eclipse.jetty</groupId>\r
                        <artifactId>jetty-io</artifactId>\r
                        <version>7.6.14.v20131031</version>\r
                </dependency>\r
-\r
                <dependency>\r
                        <groupId>org.apache.commons</groupId>\r
                        <artifactId>commons-io</artifactId>\r
                <dependency>\r
                        <groupId>org.apache.httpcomponents</groupId>\r
                        <artifactId>httpcore</artifactId>\r
-                       <version>4.2.2</version>\r
+                       <version>4.4</version>\r
                </dependency>\r
-\r
                <dependency>\r
                        <groupId>commons-codec</groupId>\r
                        <artifactId>commons-codec</artifactId>\r
                        <version>1.6</version>\r
                </dependency>\r
-\r
                <dependency>\r
                        <groupId>org.mozilla</groupId>\r
                        <artifactId>rhino</artifactId>\r
                                </exclusion>\r
                        </exclusions>\r
                </dependency>\r
-\r
-\r
                <dependency>\r
                        <groupId>log4j</groupId>\r
                        <artifactId>log4j</artifactId>\r
                        <scope>compile</scope>\r
                </dependency>\r
        </dependencies>\r
-\r
        <build>\r
                <finalName>datarouter-node</finalName>\r
                <resources>\r
                                        <include>**/log4j.properties</include>\r
                                </includes>\r
                        </resource>\r
-\r
                </resources>\r
                <plugins>\r
                        <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-compiler-plugin</artifactId>\r
                                <configuration>\r
-                                       <archive>\r
-                                               <manifest>\r
-                                                       <mainClass>org.onap.datarouter.node.NodeMain</mainClass>\r
-\r
-                                               </manifest>\r
-                                       </archive>\r
-\r
                                        <source>1.8</source>\r
                                        <target>1.8</target>\r
                                </configuration>\r
                                        </descriptorRefs>\r
                                        <outputDirectory>${basedir}/target/opt/app/datartr/lib</outputDirectory>\r
                                        <archive>\r
-\r
                                                <manifest>\r
                                                        <addClasspath>true</addClasspath>\r
-                                                       <mainClass>org.onap.datarouter.node.NodeMain</mainClass>\r
+                                                       <mainClass>org.onap.dmaap.datarouter.node.NodeMain</mainClass>\r
                                                </manifest>\r
                                        </archive>\r
                                </configuration>\r
-\r
                                <executions>\r
                                        <execution>\r
-                                               <id>make-assembly</id> <!-- this is used for inheritance merges -->\r
-                                               <phase>package</phase> <!-- bind to the packaging phase -->\r
+                                               <id>make-assembly</id>\r
+                                               <!-- this is used for inheritance merges -->\r
+                                               <phase>package</phase>\r
+                                               <!-- bind to the packaging phase -->\r
                                                <goals>\r
                                                        <goal>single</goal>\r
                                                </goals>\r
                                                        <goal>copy-resources</goal>\r
                                                </goals>\r
                                                <configuration>\r
-                                                       <outputDirectory>${dockerLocation}</outputDirectory>\r
+                                                       <outputDirectory>${docker.location}</outputDirectory>\r
                                                        <overwrite>true</overwrite>\r
                                                        <resources>\r
                                                                <resource>\r
                                                </configuration>\r
                                        </execution>\r
                                        <execution>\r
-        <id>copy-resources-1</id>\r
-        <phase>validate</phase>\r
-        <goals>\r
-          <goal>copy-resources</goal>\r
-        </goals>\r
-        <configuration>\r
-          <outputDirectory>${basedir}/target/opt/app/datartr/self_signed</outputDirectory>\r
-          <resources>\r
-            <resource>\r
-                        <directory>${basedir}/self_signed</directory>\r
-                        <includes>\r
-                            <include>misc/**</include>\r
-                            <include>**/**</include>\r
-                        </includes>\r
-                    </resource>\r
-          </resources>\r
-        </configuration>\r
-      </execution>\r
+                                               <id>copy-resources-1</id>\r
+                                               <phase>validate</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-resources</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <outputDirectory>${basedir}/target/opt/app/datartr/self_signed</outputDirectory>\r
+                                                       <resources>\r
+                                                               <resource>\r
+                                                                       <directory>${basedir}/self_signed</directory>\r
+                                                                       <includes>\r
+                                                                               <include>misc/**</include>\r
+                                                                               <include>**/**</include>\r
+                                                                       </includes>\r
+                                                               </resource>\r
+                                                       </resources>\r
+                                               </configuration>\r
+                                       </execution>\r
                                </executions>\r
                        </plugin>\r
                        <plugin>\r
                                <version>0.4.11</version>\r
                                <configuration>\r
                                        <imageName>onap/dmaap/datarouter-node</imageName>\r
-                                       <dockerDirectory>${dockerLocation}</dockerDirectory>\r
+                                       <dockerDirectory>${docker.location}</dockerDirectory>\r
                                        <serverId>docker-hub</serverId>\r
                                        <registryUrl>https://${docker.registry}</registryUrl>\r
                                        <imageTags>\r
                                        <forceTags>true</forceTags>\r
                                </configuration>\r
                        </plugin>\r
-\r
                        <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-dependency-plugin</artifactId>\r
                                        </execution>\r
                                </executions>\r
                        </plugin>\r
-                                                                               <plugin>\r
-                       <groupId>org.apache.maven.plugins</groupId>\r
-                       <artifactId>maven-javadoc-plugin</artifactId>\r
-                       <configuration>\r
-                       <failOnError>false</failOnError>\r
-                       </configuration>\r
-                       <executions>\r
-                               <execution>\r
-                                       <id>attach-javadocs</id>\r
-                                       <goals>\r
-                                               <goal>jar</goal>\r
-                                       </goals>\r
-                               </execution>\r
-                       </executions>\r
-               </plugin> \r
-          \r
-          \r
-              <plugin>\r
-                     <groupId>org.apache.maven.plugins</groupId>\r
-                     <artifactId>maven-source-plugin</artifactId>\r
-                     <version>2.2.1</version>\r
-                     <executions>\r
-                       <execution>\r
-                         <id>attach-sources</id>\r
-                         <goals>\r
-                           <goal>jar-no-fork</goal>\r
-                         </goals>\r
-                       </execution>\r
-                     </executions>\r
-                   </plugin>   \r
-                       \r
-               <plugin>\r
+                       <plugin>\r
+                               <groupId>org.apache.maven.plugins</groupId>\r
+                               <artifactId>maven-javadoc-plugin</artifactId>\r
+                               <configuration>\r
+                                       <failOnError>false</failOnError>\r
+                               </configuration>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>attach-javadocs</id>\r
+                                               <goals>\r
+                                                       <goal>jar</goal>\r
+                                               </goals>\r
+                                       </execution>\r
+                               </executions>\r
+                       </plugin>\r
+                       <plugin>\r
+                               <groupId>org.apache.maven.plugins</groupId>\r
+                               <artifactId>maven-source-plugin</artifactId>\r
+                               <version>2.2.1</version>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>attach-sources</id>\r
+                                               <goals>\r
+                                                       <goal>jar-no-fork</goal>\r
+                                               </goals>\r
+                                       </execution>\r
+                               </executions>\r
+                       </plugin>\r
+                       <plugin>\r
                                <groupId>org.codehaus.mojo</groupId>\r
                                <artifactId>cobertura-maven-plugin</artifactId>\r
                                <version>2.7</version>\r
                                <configuration>\r
                                        <formats>\r
-                                       <format>html</format>\r
-                                       <format>xml</format>\r
-                                 </formats>\r
+                                               <format>html</format>\r
+                                               <format>xml</format>\r
+                                       </formats>\r
                                </configuration>\r
                        </plugin>\r
-<plugin>\r
+                       <plugin>\r
                                <groupId>org.sonatype.plugins</groupId>\r
                                <artifactId>nexus-staging-maven-plugin</artifactId>\r
                                <version>1.6.7</version>\r
                                        <serverId>ecomp-staging</serverId>\r
                                </configuration>\r
                        </plugin>\r
-                       \r
                        <plugin>\r
-          <groupId>org.jacoco</groupId>\r
-          <artifactId>jacoco-maven-plugin</artifactId>\r
-          <version>${jacoco.version}</version>\r
-          <configuration>\r
-            <excludes>\r
-              <exclude>**/gen/**</exclude>\r
-              <exclude>**/generated-sources/**</exclude>\r
-              <exclude>**/yang-gen/**</exclude>\r
-              <exclude>**/pax/**</exclude>\r
-            </excludes>\r
-          </configuration>\r
-          <executions>\r
-\r
-            <execution>\r
-              <id>pre-unit-test</id>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
-                <propertyName>surefireArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-            \r
-       \r
-            <execution>\r
-              <id>post-unit-test</id>\r
-              <phase>test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-            <execution>\r
-              <id>pre-integration-test</id>\r
-              <phase>pre-integration-test</phase>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
-\r
-                <propertyName>failsafeArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-\r
-       \r
-            <execution>\r
-              <id>post-integration-test</id>\r
-              <phase>post-integration-test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-          </executions>\r
-        </plugin>\r
+                               <groupId>org.jacoco</groupId>\r
+                               <artifactId>jacoco-maven-plugin</artifactId>\r
+                               <version>${jacoco.version}</version>\r
+                               <configuration>\r
+                                       <excludes>\r
+                                               <exclude>**/gen/**</exclude>\r
+                                               <exclude>**/generated-sources/**</exclude>\r
+                                               <exclude>**/yang-gen/**</exclude>\r
+                                               <exclude>**/pax/**</exclude>\r
+                                       </excludes>\r
+                               </configuration>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>pre-unit-test</id>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
+                                                       <propertyName>surefireArgLine</propertyName>\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>post-unit-test</id>\r
+                                               <phase>test</phase>\r
+                                               <goals>\r
+                                                       <goal>report</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
+                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>pre-integration-test</id>\r
+                                               <phase>pre-integration-test</phase>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
+                                                       <propertyName>failsafeArgLine</propertyName>\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>post-integration-test</id>\r
+                                               <phase>post-integration-test</phase>\r
+                                               <goals>\r
+                                                       <goal>report</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
+                                                       <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
+                                               </configuration>\r
+                                       </execution>\r
+                               </executions>\r
+                       </plugin>\r
                </plugins>\r
        </build>\r
-<distributionManagement>\r
+       <distributionManagement>\r
                <repository>\r
                        <id>ecomp-releases</id>\r
                        <name>DR Release Repository</name>\r
                        <url>dav:${nexusproxy}${sitePath}</url>\r
                </site>\r
        </distributionManagement>\r
-    <pluginRepositories>\r
-        <pluginRepository>\r
-            <id>onap-plugin-snapshots</id>\r
-            <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
-        </pluginRepository>\r
-    </pluginRepositories>\r
-       \r
-\r
-       \r
-</project>\r
+       <pluginRepositories>\r
+               <pluginRepository>\r
+                       <id>onap-plugin-snapshots</id>\r
+                       <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
+               </pluginRepository>\r
+       </pluginRepositories>\r
+</project>
\ No newline at end of file
index 8cb71dd..2384d6d 100644 (file)
@@ -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
index a47486d..11d22c7 100644 (file)
    <appender name="jettyAndNodelog"\r
     class="ch.qos.logback.core.rolling.RollingFileAppender">\r
     <file>${logDirectory}/${jettyAndNodeLogName}.log</file>\r
-     <filter class="com.att.research.datarouter.node.eelf.EELFFilter" />\r
+     <filter class="org.onap.dmaap.datarouter.node.eelf.EELFFilter" />\r
     <rollingPolicy\r
       class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">\r
       <fileNamePattern>${logDirectory}/${jettyAndNodeLogName}.%i.log.zip\r
index 617b01d..654afb6 100644 (file)
@@ -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 "$@"
index ba784f3..9bce062 100644 (file)
@@ -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" = "" ]
index 9d6841c..07ddc84 100644 (file)
   * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
   *\r
 -->\r
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-         <modelVersion>4.0.0</modelVersion>\r
-       <parent>\r
-               <groupId>org.onap.dmaap.datarouter</groupId>\r
-               <artifactId>parent</artifactId>\r
-               <version>1.0.1-SNAPSHOT</version>\r
-               <relativePath>../pom.xml</relativePath>\r
-       </parent>\r
-       \r
-       <artifactId>datarouter-prov</artifactId>\r
-       <packaging>jar</packaging>\r
-       <name>datarouter-prov</name>\r
-       <url>https://github.com/att/DMAAP_DATAROUTER</url>\r
\r
-       <properties>\r
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-               <maven.compiler.source>1.8</maven.compiler.source>\r
-               <maven.compiler.target>1.8</maven.compiler.target>\r
-               <dockerLocation>${basedir}/target/</dockerLocation>\r
-               <sonar.language>java</sonar.language>\r
-                       <sonar.skip>false</sonar.skip>\r
-               <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
-               <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
-               <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
-               <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
-               <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
-               <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
-               <nexusproxy>https://nexus.onap.org</nexusproxy>\r
-               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
-               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
-               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
-       </properties>\r
-        <dependencies>\r
-            <dependency>\r
-               <groupId>ch.qos.logback</groupId>\r
-               <artifactId>logback-classic</artifactId>\r
-               <version>1.2.0</version>\r
-               <scope>compile</scope>\r
-       </dependency>\r
-       <dependency>\r
-               <groupId>ch.qos.logback</groupId>\r
-               <artifactId>logback-core</artifactId>\r
-               <version>1.2.0</version>\r
-               <scope>compile</scope>\r
-       </dependency>\r
-            <dependency>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <parent>\r
+        <groupId>org.onap.dmaap.datarouter</groupId>\r
+        <artifactId>parent</artifactId>\r
+        <version>1.0.1-SNAPSHOT</version>\r
+        <relativePath>../pom.xml</relativePath>\r
+    </parent>\r
+    <artifactId>datarouter-prov</artifactId>\r
+    <packaging>jar</packaging>\r
+    <name>datarouter-prov</name>\r
+    <url>https://github.com/att/DMAAP_DATAROUTER</url>\r
+    <properties>\r
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+        <maven.compiler.source>1.8</maven.compiler.source>\r
+        <maven.compiler.target>1.8</maven.compiler.target>\r
+        <docker.location>${basedir}/target/</docker.location>\r
+        <sonar.language>java</sonar.language>\r
+        <sonar.skip>false</sonar.skip>\r
+        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+        <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
+        <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec\r
+        </sonar.jacoco.itReportPath>\r
+        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
+        <nexusproxy>https://nexus.onap.org</nexusproxy>\r
+        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
+        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
+        <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
+        <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
+    </properties>\r
+    <dependencies>\r
+        <dependency>\r
+            <groupId>ch.qos.logback</groupId>\r
+            <artifactId>logback-classic</artifactId>\r
+            <version>1.2.0</version>\r
+            <scope>compile</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>ch.qos.logback</groupId>\r
+            <artifactId>logback-core</artifactId>\r
+            <version>1.2.0</version>\r
+            <scope>compile</scope>\r
+        </dependency>\r
+        <dependency>\r
             <groupId>com.thoughtworks.xstream</groupId>\r
             <artifactId>xstream</artifactId>\r
             <version>1.4.7</version>\r
         </dependency>\r
-               <dependency>\r
-                       <groupId>org.json</groupId>\r
-                       <artifactId>json</artifactId>\r
-                       <version>20160810</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>javax.mail</groupId>\r
-                       <artifactId>javax.mail-api</artifactId>\r
-                       <version>1.5.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.att.eelf</groupId>\r
-                       <artifactId>eelf-core</artifactId>\r
-                       <version>0.0.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>javax.servlet</groupId>\r
-                       <artifactId>servlet-api</artifactId>\r
-                       <version>2.5</version>\r
-               </dependency>\r
-\r
-               <dependency>\r
-                       <groupId>org.eclipse.jetty</groupId>\r
-                       <artifactId>jetty-server</artifactId>\r
-                       <version>7.6.14.v20131031</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.eclipse.jetty</groupId>\r
-                       <artifactId>jetty-continuation</artifactId>\r
-                       <version>7.6.14.v20131031</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.eclipse.jetty</groupId>\r
-                       <artifactId>jetty-util</artifactId>\r
-                       <version>7.6.14.v20131031</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.eclipse.jetty</groupId>\r
-                       <artifactId>jetty-deploy</artifactId>\r
-                       <version>7.6.14.v20131031</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.eclipse.jetty</groupId>\r
-                       <artifactId>jetty-servlet</artifactId>\r
-                       <version>7.6.14.v20131031</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.eclipse.jetty</groupId>\r
-                       <artifactId>jetty-servlets</artifactId>\r
-                       <version>7.6.14.v20131031</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.eclipse.jetty</groupId>\r
-                       <artifactId>jetty-http</artifactId>\r
-                       <version>7.6.14.v20131031</version>\r
-               </dependency>\r
-\r
-               <dependency>\r
-                       <groupId>org.eclipse.jetty</groupId>\r
-                       <artifactId>jetty-security</artifactId>\r
-                       <version>7.6.14.v20131031</version>\r
-               </dependency>\r
-\r
-               <dependency>\r
-                       <groupId>org.eclipse.jetty</groupId>\r
-                       <artifactId>jetty-websocket</artifactId>\r
-                       <version>7.6.14.v20131031</version>\r
-               </dependency>\r
-\r
-               <dependency>\r
-                       <groupId>org.eclipse.jetty</groupId>\r
-                       <artifactId>jetty-io</artifactId>\r
-                       <version>7.6.14.v20131031</version>\r
-               </dependency>\r
-\r
-               <dependency>\r
-                       <groupId>org.apache.commons</groupId>\r
-                       <artifactId>commons-io</artifactId>\r
-                       <version>1.3.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-lang</groupId>\r
-                       <artifactId>commons-lang</artifactId>\r
-                       <version>2.4</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-io</groupId>\r
-                       <artifactId>commons-io</artifactId>\r
-                       <version>2.1</version>\r
-                       <scope>compile</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.httpcomponents</groupId>\r
-                       <artifactId>httpcore</artifactId>\r
-                       <version>4.2.2</version>\r
-               </dependency>\r
-\r
-               <dependency>\r
-                       <groupId>org.mozilla</groupId>\r
-                       <artifactId>rhino</artifactId>\r
-                       <version>1.7R3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.james</groupId>\r
-                       <artifactId>apache-mime4j-core</artifactId>\r
-                       <version>0.7</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.httpcomponents</groupId>\r
-                       <artifactId>httpclient</artifactId>\r
-                       <version>4.5.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.sonatype.http-testing-harness</groupId>\r
-                       <artifactId>junit-runner</artifactId>\r
-                       <version>0.11</version>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>org.databene</groupId>\r
-                                       <artifactId>contiperf</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <version>4.10</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-\r
-               <dependency>\r
-                   <groupId>org.mockito</groupId>\r
-                   <artifactId>mockito-core</artifactId>\r
-                   <version>1.10.19</version>\r
-                   <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                   <groupId>org.powermock</groupId>\r
-                   <artifactId>powermock-module-junit4</artifactId>\r
-                   <version>1.6.4</version>\r
-                   <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                   <groupId>org.powermock</groupId>\r
-                   <artifactId>powermock-api-mockito</artifactId>\r
-                   <version>1.6.4</version>\r
-                   <scope>test</scope>\r
-               </dependency>\r
-<!--           <dependency>\r
-                       <groupId>org.junit</groupId>\r
-                       <artifactId>com.springsource.org.junit</artifactId>\r
-                       <version>4.4.0</version>\r
-               </dependency> -->\r
-               <dependency>\r
-                       <groupId>mysql</groupId>\r
-                       <artifactId>mysql-connector-java</artifactId>\r
-                       <version>5.1.21</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.eclipse.jetty.cdi</groupId>\r
-                       <artifactId>cdi-websocket</artifactId>\r
-                       <version>9.3.11.v20160721</version>\r
-               </dependency>\r
-               \r
-               <dependency>\r
-                       <groupId>log4j</groupId>\r
-                       <artifactId>log4j</artifactId>\r
-                       <version>1.2.17</version>\r
-                       <scope>compile</scope>\r
-               </dependency>\r
-       </dependencies>\r
-\r
-       <build>\r
-               <finalName>datarouter-prov</finalName>\r
-               <resources>\r
-                       <resource>\r
-                               <directory>src/main/resources</directory>\r
-                               <filtering>true</filtering>\r
-                               <includes>\r
-                                       <include>**/*.properties</include>\r
-                               </includes>\r
-                       </resource>\r
-                       <resource>\r
-                               <directory>src/main/resources</directory>\r
-                               <filtering>true</filtering>\r
-                               <includes>\r
-                                       <include>**/proserver.properties</include>\r
-                               </includes>\r
-                       </resource>\r
-                       <resource>\r
-                               <directory>src/main/resources</directory>\r
-                               <filtering>true</filtering>\r
-                               <includes>\r
-                                       <include>**/EelfMessages.properties</include>\r
-                               </includes>\r
-                       </resource>\r
-                       <resource>\r
-                               <directory>src/main/resources</directory>\r
-                               <filtering>true</filtering>\r
-                               <includes>\r
-                                       <include>**/log4j.properties</include>\r
-                               </includes>\r
-                       </resource>\r
-                       <!-- <resource> <directory>src/main/config</directory> <filtering>true</filtering> \r
-                               <includes> <include>**/log4j*.xml</include> </includes> </resource> <resource> \r
-                               <directory>src/main/resources</directory> <filtering>false</filtering> <excludes> \r
-                               <exclude>**/cambriaApiVersion.properties</exclude> </excludes> </resource> -->\r
-               </resources>\r
-               <plugins>\r
-               \r
-                       <plugin>\r
-                               <artifactId>maven-assembly-plugin</artifactId>\r
-                               <version>2.4</version>\r
-                               <configuration>\r
-                                       <descriptorRefs>\r
-                                               <descriptorRef>jar-with-dependencies</descriptorRef>\r
-                                       </descriptorRefs>\r
-                                       <outputDirectory>${basedir}/target/opt/app/datartr/lib</outputDirectory>\r
-                                       <archive>\r
-\r
-                                               <manifest>\r
-                                                       <addClasspath>true</addClasspath>\r
-                                                       <mainClass>org.onap.datarouter.provisioning.Main</mainClass>\r
-                                                        \r
-                                               </manifest>\r
-                                       </archive>\r
-                               </configuration>\r
-\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>make-assembly</id> <!-- this is used for inheritance merges -->\r
-                                               <phase>package</phase> <!-- bind to the packaging phase -->\r
-                                               <goals>\r
-                                                       <goal>single</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-compiler-plugin</artifactId>\r
-                               <configuration>\r
-                                       <archive>\r
-                                               <manifest>\r
-                                                       <addClasspath>true</addClasspath>\r
-                                                       <mainClass>org.onap.datarouter.provisioning.Main</mainClass>\r
-                                                        <outputDirectory>${basedir}/target/opt/app/datartr/lib</outputDirectory>\r
-                                               </manifest>\r
-                                       </archive>\r
-\r
-                                       <source>1.8</source>\r
-                                       <target>1.8</target>\r
-                               </configuration>\r
-                               <version>3.6.0</version>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-resources-plugin</artifactId>\r
-                               <version>2.7</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>copy-docker-file</id>\r
-                                               <phase>package</phase>\r
-                                               <goals>\r
-                                                       <goal>copy-resources</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <outputDirectory>${dockerLocation}</outputDirectory>\r
-                                                       <overwrite>true</overwrite>\r
-                                                       <resources>\r
-                                                               <resource>\r
-                                                                       <directory>${basedir}/src/main/resources/docker</directory>\r
-                                                                       <filtering>true</filtering>\r
-                                                                       <includes>\r
-                                                                               <include>**/*</include>\r
-                                                                       </includes>\r
-                                                               </resource>\r
-                                                       </resources>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-       <plugin>\r
-                               <groupId>com.spotify</groupId>\r
-                               <artifactId>docker-maven-plugin</artifactId>\r
-                               <version>0.4.11</version>\r
-                               <configuration>\r
-                                       <imageName>onap/dmaap/datarouter-prov</imageName>\r
-                                       <dockerDirectory>${dockerLocation}</dockerDirectory>\r
-                                       <serverId>docker-hub</serverId>\r
-                                       <registryUrl>https://${docker.registry}</registryUrl>\r
-                                       <imageTags>\r
-                                               <imageTag>${project.version}</imageTag>\r
-                                               <imageTag>latest</imageTag>\r
-                                       </imageTags>\r
-                                       <forceTags>true</forceTags>\r
-                               </configuration>\r
-                       </plugin> \r
-                       \r
-\r
-  \r
-  <plugin>\r
-    <artifactId>maven-resources-plugin</artifactId>\r
-    <version>2.7</version>\r
-    <executions>\r
-      <execution>\r
-        <id>copy-resources-1</id>\r
-        <phase>validate</phase>\r
-        <goals>\r
-          <goal>copy-resources</goal>\r
-        </goals>\r
-        <configuration>\r
-          <outputDirectory>${basedir}/target/opt/app/datartr/lib</outputDirectory>\r
-          <resources>\r
+        <dependency>\r
+            <groupId>org.json</groupId>\r
+            <artifactId>json</artifactId>\r
+            <version>20160810</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>javax.mail</groupId>\r
+            <artifactId>javax.mail-api</artifactId>\r
+            <version>1.5.1</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.att.eelf</groupId>\r
+            <artifactId>eelf-core</artifactId>\r
+            <version>0.0.1</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>javax.servlet</groupId>\r
+            <artifactId>servlet-api</artifactId>\r
+            <version>2.5</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.eclipse.jetty</groupId>\r
+            <artifactId>jetty-server</artifactId>\r
+            <version>7.6.14.v20131031</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.eclipse.jetty</groupId>\r
+            <artifactId>jetty-continuation</artifactId>\r
+            <version>7.6.14.v20131031</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.eclipse.jetty</groupId>\r
+            <artifactId>jetty-util</artifactId>\r
+            <version>7.6.14.v20131031</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.eclipse.jetty</groupId>\r
+            <artifactId>jetty-deploy</artifactId>\r
+            <version>7.6.14.v20131031</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.eclipse.jetty</groupId>\r
+            <artifactId>jetty-servlet</artifactId>\r
+            <version>7.6.14.v20131031</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.eclipse.jetty</groupId>\r
+            <artifactId>jetty-servlets</artifactId>\r
+            <version>7.6.14.v20131031</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.eclipse.jetty</groupId>\r
+            <artifactId>jetty-http</artifactId>\r
+            <version>7.6.14.v20131031</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.eclipse.jetty</groupId>\r
+            <artifactId>jetty-security</artifactId>\r
+            <version>7.6.14.v20131031</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.eclipse.jetty</groupId>\r
+            <artifactId>jetty-websocket</artifactId>\r
+            <version>7.6.14.v20131031</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.eclipse.jetty</groupId>\r
+            <artifactId>jetty-io</artifactId>\r
+            <version>7.6.14.v20131031</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.apache.commons</groupId>\r
+            <artifactId>commons-io</artifactId>\r
+            <version>1.3.2</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>commons-lang</groupId>\r
+            <artifactId>commons-lang</artifactId>\r
+            <version>2.4</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>commons-io</groupId>\r
+            <artifactId>commons-io</artifactId>\r
+            <version>2.1</version>\r
+            <scope>compile</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.apache.httpcomponents</groupId>\r
+            <artifactId>httpcore</artifactId>\r
+            <version>4.4</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.mozilla</groupId>\r
+            <artifactId>rhino</artifactId>\r
+            <version>1.7R3</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.apache.james</groupId>\r
+            <artifactId>apache-mime4j-core</artifactId>\r
+            <version>0.7</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.apache.httpcomponents</groupId>\r
+            <artifactId>httpclient</artifactId>\r
+            <version>4.5.3</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.sonatype.http-testing-harness</groupId>\r
+            <artifactId>junit-runner</artifactId>\r
+            <version>0.11</version>\r
+            <exclusions>\r
+                <exclusion>\r
+                    <groupId>org.databene</groupId>\r
+                    <artifactId>contiperf</artifactId>\r
+                </exclusion>\r
+            </exclusions>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>junit</groupId>\r
+            <artifactId>junit</artifactId>\r
+            <version>4.10</version>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.mockito</groupId>\r
+            <artifactId>mockito-core</artifactId>\r
+            <version>1.10.19</version>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.powermock</groupId>\r
+            <artifactId>powermock-module-junit4</artifactId>\r
+            <version>1.6.4</version>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.powermock</groupId>\r
+            <artifactId>powermock-api-mockito</artifactId>\r
+            <version>1.6.4</version>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <!--        <dependency><groupId>org.junit</groupId><artifactId>com.springsource.org.junit</artifactId><version>4.4.0</version></dependency>-->\r
+        <dependency>\r
+            <groupId>mysql</groupId>\r
+            <artifactId>mysql-connector-java</artifactId>\r
+            <version>5.1.21</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.eclipse.jetty.cdi</groupId>\r
+            <artifactId>cdi-websocket</artifactId>\r
+            <version>9.3.11.v20160721</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>log4j</groupId>\r
+            <artifactId>log4j</artifactId>\r
+            <version>1.2.17</version>\r
+            <scope>compile</scope>\r
+        </dependency>\r
+    </dependencies>\r
+    <build>\r
+        <finalName>datarouter-prov</finalName>\r
+        <resources>\r
             <resource>\r
-                        <directory>${project.basedir}/src/main/resources</directory> \r
-                        <includes>\r
-                            <include>**/*.jar</include>\r
-                        </includes>   \r
-                    </resource>\r
-          </resources>\r
-        </configuration>\r
-      </execution>\r
-      <execution>\r
-        <id>copy-resources-2</id>\r
-        <phase>validate</phase>\r
-        <goals>\r
-          <goal>copy-resources</goal>\r
-        </goals>\r
-        <configuration>\r
-          <outputDirectory>${basedir}/target/opt/app/datartr/etc</outputDirectory>\r
-          <resources>\r
+                <directory>src/main/resources</directory>\r
+                <filtering>true</filtering>\r
+                <includes>\r
+                    <include>**/*.properties</include>\r
+                </includes>\r
+            </resource>\r
             <resource>\r
-                        <directory>${basedir}/src/main/resources</directory>\r
-                        <includes>\r
-                            <include>misc/**</include>\r
-                            <include>**/**</include>\r
-                        </includes>\r
-                    </resource>\r
-          </resources>\r
-        </configuration>\r
-      </execution>\r
-      <execution>\r
-        <id>copy-resources-3</id>\r
-        <phase>validate</phase>\r
-        <goals>\r
-          <goal>copy-resources</goal>\r
-        </goals>\r
-        <configuration>\r
-          <outputDirectory>${basedir}/target/opt/app/datartr</outputDirectory>\r
-          <resources>\r
+                <directory>src/main/resources</directory>\r
+                <filtering>true</filtering>\r
+                <includes>\r
+                    <include>**/proserver.properties</include>\r
+                </includes>\r
+            </resource>\r
             <resource>\r
-                        <directory>${basedir}/data</directory>\r
-                        <includes>\r
-                            <include>misc/**</include>\r
-                            <include>**/**</include>\r
-                        </includes>\r
-                    </resource>\r
-          </resources>\r
-        </configuration>\r
-      </execution>\r
-          <execution>\r
-        <id>copy-resources-4</id>\r
-        <phase>validate</phase>\r
-        <goals>\r
-          <goal>copy-resources</goal>\r
-        </goals>\r
-        <configuration>\r
-          <outputDirectory>${basedir}/target/opt/app/datartr/self_signed</outputDirectory>\r
-          <resources>\r
+                <directory>src/main/resources</directory>\r
+                <filtering>true</filtering>\r
+                <includes>\r
+                    <include>**/EelfMessages.properties</include>\r
+                </includes>\r
+            </resource>\r
             <resource>\r
-                        <directory>${basedir}/self_signed</directory>\r
-                        <includes>\r
-                            <include>misc/**</include>\r
-                            <include>**/**</include>\r
-                        </includes>\r
-                    </resource>\r
-          </resources>\r
-        </configuration>\r
-      </execution>\r
-         \r
-    </executions>\r
-  </plugin>\r
-  \r
-                       <plugin>\r
-                               <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-dependency-plugin</artifactId>\r
-                               <version>2.10</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>copy-dependencies</id>\r
-                                               <phase>package</phase>\r
-                                               <goals>\r
-                                                       <goal>copy-dependencies</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <outputDirectory>${project.build.directory}/opt/app/datartr/lib</outputDirectory>\r
-                                                       <overWriteReleases>false</overWriteReleases>\r
-                                                       <overWriteSnapshots>false</overWriteSnapshots>\r
-                                                       <overWriteIfNewer>true</overWriteIfNewer>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       \r
-                                                                               <plugin>\r
-                       <groupId>org.apache.maven.plugins</groupId>\r
-                       <artifactId>maven-javadoc-plugin</artifactId>\r
-                       <configuration>\r
-                       <failOnError>false</failOnError>\r
-                       </configuration>\r
-                       <executions>\r
-                               <execution>\r
-                                       <id>attach-javadocs</id>\r
-                                       <goals>\r
-                                               <goal>jar</goal>\r
-                                       </goals>\r
-                               </execution>\r
-                       </executions>\r
-               </plugin> \r
-          \r
-          \r
-              <plugin>\r
-                     <groupId>org.apache.maven.plugins</groupId>\r
-                     <artifactId>maven-source-plugin</artifactId>\r
-                     <version>2.2.1</version>\r
-                     <executions>\r
-                       <execution>\r
-                         <id>attach-sources</id>\r
-                         <goals>\r
-                           <goal>jar-no-fork</goal>\r
-                         </goals>\r
-                       </execution>\r
-                     </executions>\r
-                   </plugin>                           \r
-                       \r
-               <plugin>\r
-                               <groupId>org.codehaus.mojo</groupId>\r
-                               <artifactId>cobertura-maven-plugin</artifactId>\r
-                               <version>2.7</version>\r
-                               <configuration>\r
-                                       <formats>\r
-                                       <format>html</format>\r
-                                       <format>xml</format>\r
-                                 </formats>\r
-                               </configuration>\r
-                       </plugin>\r
-                       \r
-                       \r
-               <plugin>\r
-                               <groupId>org.sonatype.plugins</groupId>\r
-                               <artifactId>nexus-staging-maven-plugin</artifactId>\r
-                               <version>1.6.7</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <nexusUrl>${nexusproxy}</nexusUrl>\r
-                                       <stagingProfileId>176c31dfe190a</stagingProfileId>\r
-                                       <serverId>ecomp-staging</serverId>\r
-                               </configuration>\r
-                       </plugin>\r
-                       \r
-                       <plugin>\r
-          <groupId>org.jacoco</groupId>\r
-          <artifactId>jacoco-maven-plugin</artifactId>\r
-          <version>${jacoco.version}</version>\r
-          <configuration>\r
-            <excludes>\r
-              <exclude>**/gen/**</exclude>\r
-              <exclude>**/generated-sources/**</exclude>\r
-              <exclude>**/yang-gen/**</exclude>\r
-              <exclude>**/pax/**</exclude>\r
-            </excludes>\r
-          </configuration>\r
-          <executions>\r
-\r
-            <execution>\r
-              <id>pre-unit-test</id>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
-                <propertyName>surefireArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-            \r
-       \r
-            <execution>\r
-              <id>post-unit-test</id>\r
-              <phase>test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-            <execution>\r
-              <id>pre-integration-test</id>\r
-              <phase>pre-integration-test</phase>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
-\r
-                <propertyName>failsafeArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-\r
-       \r
-            <execution>\r
-              <id>post-integration-test</id>\r
-              <phase>post-integration-test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-          </executions>\r
-        </plugin>      \r
-               </plugins>\r
-       </build>\r
-<distributionManagement>\r
-               <repository>\r
-                       <id>ecomp-releases</id>\r
-                       <name>DR Release Repository</name>\r
-                       <url>${nexusproxy}${releaseNexusPath}</url>\r
-               </repository>\r
-               <snapshotRepository>\r
-                       <id>ecomp-snapshots</id>\r
-                       <name>DR Snapshot Repository</name>\r
-                       <url>${nexusproxy}${snapshotNexusPath}</url>\r
-               </snapshotRepository>\r
-               <site>\r
-                       <id>ecomp-site</id>\r
-                       <url>dav:${nexusproxy}${sitePath}</url>\r
-               </site>\r
-       </distributionManagement>\r
+                <directory>src/main/resources</directory>\r
+                <filtering>true</filtering>\r
+                <includes>\r
+                    <include>**/log4j.properties</include>\r
+                </includes>\r
+            </resource>\r
+            <!-- <resource><directory>src/main/config</directory><filtering>true</filtering><includes><include>**/log4j*.xml</include></includes></resource><resource><directory>src/main/resources</directory><filtering>false</filtering><excludes><exclude>**/cambriaApiVersion.properties</exclude></excludes></resource>-->\r
+        </resources>\r
+        <plugins>\r
+            <plugin>\r
+                <artifactId>maven-assembly-plugin</artifactId>\r
+                <version>2.4</version>\r
+                <configuration>\r
+                    <descriptorRefs>\r
+                        <descriptorRef>jar-with-dependencies</descriptorRef>\r
+                    </descriptorRefs>\r
+                    <outputDirectory>${basedir}/target/opt/app/datartr/lib</outputDirectory>\r
+                    <archive>\r
+                        <manifest>\r
+                            <addClasspath>true</addClasspath>\r
+                            <mainClass>org.onap.dmaap.datarouter.provisioning.Main</mainClass>\r
+                        </manifest>\r
+                    </archive>\r
+                </configuration>\r
+                <executions>\r
+                    <execution>\r
+                        <id>make-assembly</id>\r
+                        <!-- this is used for inheritance merges -->\r
+                        <phase>package</phase>\r
+                        <!-- bind to the packaging phase -->\r
+                        <goals>\r
+                            <goal>single</goal>\r
+                        </goals>\r
+                    </execution>\r
+                </executions>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-compiler-plugin</artifactId>\r
+                <configuration>\r
+                    <source>1.8</source>\r
+                    <target>1.8</target>\r
+                </configuration>\r
+                <version>3.6.0</version>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>com.spotify</groupId>\r
+                <artifactId>docker-maven-plugin</artifactId>\r
+                <version>0.4.11</version>\r
+                <configuration>\r
+                    <imageName>onap/dmaap/datarouter-prov</imageName>\r
+                    <dockerDirectory>${docker.location}</dockerDirectory>\r
+                    <serverId>docker-hub</serverId>\r
+                    <registryUrl>https://${docker.registry}</registryUrl>\r
+                    <imageTags>\r
+                        <imageTag>${project.version}</imageTag>\r
+                        <imageTag>latest</imageTag>\r
+                    </imageTags>\r
+                    <forceTags>true</forceTags>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <artifactId>maven-resources-plugin</artifactId>\r
+                <version>2.7</version>\r
+                <executions>\r
+                    <execution>\r
+                        <id>copy-docker-file</id>\r
+                        <phase>package</phase>\r
+                        <goals>\r
+                            <goal>copy-resources</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <outputDirectory>${docker.location}</outputDirectory>\r
+                            <overwrite>true</overwrite>\r
+                            <resources>\r
+                                <resource>\r
+                                    <directory>${basedir}/src/main/resources/docker</directory>\r
+                                    <filtering>true</filtering>\r
+                                    <includes>\r
+                                        <include>**/*</include>\r
+                                    </includes>\r
+                                </resource>\r
+                            </resources>\r
+                        </configuration>\r
+                    </execution>\r
+                    <execution>\r
+                        <id>copy-resources-1</id>\r
+                        <phase>validate</phase>\r
+                        <goals>\r
+                            <goal>copy-resources</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <outputDirectory>${basedir}/target/opt/app/datartr/lib</outputDirectory>\r
+                            <resources>\r
+                                <resource>\r
+                                    <directory>${project.basedir}/src/main/resources</directory>\r
+                                    <includes>\r
+                                        <include>**/*.jar</include>\r
+                                    </includes>\r
+                                </resource>\r
+                            </resources>\r
+                        </configuration>\r
+                    </execution>\r
+                    <execution>\r
+                        <id>copy-resources-2</id>\r
+                        <phase>validate</phase>\r
+                        <goals>\r
+                            <goal>copy-resources</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <outputDirectory>${basedir}/target/opt/app/datartr/etc</outputDirectory>\r
+                            <resources>\r
+                                <resource>\r
+                                    <directory>${basedir}/src/main/resources</directory>\r
+                                    <includes>\r
+                                        <include>misc/**</include>\r
+                                        <include>**/**</include>\r
+                                    </includes>\r
+                                </resource>\r
+                            </resources>\r
+                        </configuration>\r
+                    </execution>\r
+                    <execution>\r
+                        <id>copy-resources-3</id>\r
+                        <phase>validate</phase>\r
+                        <goals>\r
+                            <goal>copy-resources</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <outputDirectory>${basedir}/target/opt/app/datartr</outputDirectory>\r
+                            <resources>\r
+                                <resource>\r
+                                    <directory>${basedir}/data</directory>\r
+                                    <includes>\r
+                                        <include>misc/**</include>\r
+                                        <include>**/**</include>\r
+                                    </includes>\r
+                                </resource>\r
+                            </resources>\r
+                        </configuration>\r
+                    </execution>\r
+                    <execution>\r
+                        <id>copy-resources-4</id>\r
+                        <phase>validate</phase>\r
+                        <goals>\r
+                            <goal>copy-resources</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <outputDirectory>${basedir}/target/opt/app/datartr/self_signed</outputDirectory>\r
+                            <resources>\r
+                                <resource>\r
+                                    <directory>${basedir}/self_signed</directory>\r
+                                    <includes>\r
+                                        <include>misc/**</include>\r
+                                        <include>**/**</include>\r
+                                    </includes>\r
+                                </resource>\r
+                            </resources>\r
+                        </configuration>\r
+                    </execution>\r
+                </executions>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-dependency-plugin</artifactId>\r
+                <version>2.10</version>\r
+                <executions>\r
+                    <execution>\r
+                        <id>copy-dependencies</id>\r
+                        <phase>package</phase>\r
+                        <goals>\r
+                            <goal>copy-dependencies</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <outputDirectory>${project.build.directory}/opt/app/datartr/lib</outputDirectory>\r
+                            <overWriteReleases>false</overWriteReleases>\r
+                            <overWriteSnapshots>false</overWriteSnapshots>\r
+                            <overWriteIfNewer>true</overWriteIfNewer>\r
+                        </configuration>\r
+                    </execution>\r
+                </executions>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-javadoc-plugin</artifactId>\r
+                <configuration>\r
+                    <failOnError>false</failOnError>\r
+                </configuration>\r
+                <executions>\r
+                    <execution>\r
+                        <id>attach-javadocs</id>\r
+                        <goals>\r
+                            <goal>jar</goal>\r
+                        </goals>\r
+                    </execution>\r
+                </executions>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-source-plugin</artifactId>\r
+                <version>2.2.1</version>\r
+                <executions>\r
+                    <execution>\r
+                        <id>attach-sources</id>\r
+                        <goals>\r
+                            <goal>jar-no-fork</goal>\r
+                        </goals>\r
+                    </execution>\r
+                </executions>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.codehaus.mojo</groupId>\r
+                <artifactId>cobertura-maven-plugin</artifactId>\r
+                <version>2.7</version>\r
+                <configuration>\r
+                    <formats>\r
+                        <format>html</format>\r
+                        <format>xml</format>\r
+                    </formats>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.sonatype.plugins</groupId>\r
+                <artifactId>nexus-staging-maven-plugin</artifactId>\r
+                <version>1.6.7</version>\r
+                <extensions>true</extensions>\r
+                <configuration>\r
+                    <nexusUrl>${nexusproxy}</nexusUrl>\r
+                    <stagingProfileId>176c31dfe190a</stagingProfileId>\r
+                    <serverId>ecomp-staging</serverId>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.jacoco</groupId>\r
+                <artifactId>jacoco-maven-plugin</artifactId>\r
+                <version>${jacoco.version}</version>\r
+                <configuration>\r
+                    <excludes>\r
+                        <exclude>**/gen/**</exclude>\r
+                        <exclude>**/generated-sources/**</exclude>\r
+                        <exclude>**/yang-gen/**</exclude>\r
+                        <exclude>**/pax/**</exclude>\r
+                    </excludes>\r
+                </configuration>\r
+                <executions>\r
+                    <execution>\r
+                        <id>pre-unit-test</id>\r
+                        <goals>\r
+                            <goal>prepare-agent</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
+                            <propertyName>surefireArgLine</propertyName>\r
+                        </configuration>\r
+                    </execution>\r
+                    <execution>\r
+                        <id>post-unit-test</id>\r
+                        <phase>test</phase>\r
+                        <goals>\r
+                            <goal>report</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
+                        </configuration>\r
+                    </execution>\r
+                    <execution>\r
+                        <id>pre-integration-test</id>\r
+                        <phase>pre-integration-test</phase>\r
+                        <goals>\r
+                            <goal>prepare-agent</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
+                            <propertyName>failsafeArgLine</propertyName>\r
+                        </configuration>\r
+                    </execution>\r
+                    <execution>\r
+                        <id>post-integration-test</id>\r
+                        <phase>post-integration-test</phase>\r
+                        <goals>\r
+                            <goal>report</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
+                        </configuration>\r
+                    </execution>\r
+                </executions>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+    <distributionManagement>\r
+        <repository>\r
+            <id>ecomp-releases</id>\r
+            <name>DR Release Repository</name>\r
+            <url>${nexusproxy}${releaseNexusPath}</url>\r
+        </repository>\r
+        <snapshotRepository>\r
+            <id>ecomp-snapshots</id>\r
+            <name>DR Snapshot Repository</name>\r
+            <url>${nexusproxy}${snapshotNexusPath}</url>\r
+        </snapshotRepository>\r
+        <site>\r
+            <id>ecomp-site</id>\r
+            <url>dav:${nexusproxy}${sitePath}</url>\r
+        </site>\r
+    </distributionManagement>\r
     <pluginRepositories>\r
         <pluginRepository>\r
             <id>onap-plugin-snapshots</id>\r
             <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
         </pluginRepository>\r
     </pluginRepositories>\r
-\r
-       \r
-</project>\r
+</project>
\ No newline at end of file
index fae27ee..0d051db 100644 (file)
@@ -2,7 +2,7 @@
 # ============LICENSE_START==================================================\r
 # * org.onap.dmaap\r
 # * ===========================================================================\r
-# * Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.\r
+# * Copyright ï¿½ 2017 AT&T Intellectual Property. All rights reserved.\r
 # * ===========================================================================\r
 # * Licensed under the Apache License, Version 2.0 (the "License");\r
 # * you may not use this file except in compliance with the License.\r
@@ -27,7 +27,7 @@
 <body>\r
 <p>\r
 This package provides an implementation of the authorization-related interfaces \r
-defined by the <code>com.att.research.datarouter.authz</code> package, intended for\r
+defined by the <code>org.onap.dmaap.datarouter.authz</code> package, intended for\r
 use with the provisioning server for Data Router Release 1.   In DR R1, we do not\r
 have an external policy engine, so this implementation performs the authorization\r
 locally.\r
@@ -35,7 +35,7 @@ locally.
 <p>\r
 In order to perform the authorization, this package needs access to provisioning data \r
 about feeds and subscriptions.  This package defines an interface\r
-(<code>com.att.research.datarouter.authz.impl.ProvDataProvider</code>) through which it\r
+(<code>org.onap.dmaap.datarouter.authz.impl.ProvDataProvider</code>) through which it\r
 expects to get this data.   The provisioning server code must provide an implementation\r
 of this interface.\r
 </p>\r
@@ -43,14 +43,14 @@ of this interface.
 A software component that wishes to use this implementation must:\r
 <ul>\r
 <li>Provide an implementation of the \r
-<code>com.att.research.datarouter.authz.impl.ProvDataProvider</code>\r
+<code>org.onap.dmaap.datarouter.authz.impl.ProvDataProvider</code>\r
 interface.\r
 </li>\r
 <li>\r
 Create an instance of the <code>ProvDataProvider</code> implementation.\r
 <li>\r
 Create an instance of the\r
-<code>com.att.research.datarouter.authz.impl.ProvAuthorizer</code>\r
+<code>org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer</code>\r
 class defined in this package, passing it an instance of the <code>ProvDataProvider</code>\r
 implementation.\r
 </li>\r
index 45d9748..fb13f5d 100644 (file)
@@ -484,11 +484,11 @@ public class BaseServlet extends HttpServlet implements ProvDataProvider {
        private void checkHttpsRelaxation() {\r
                if(mailSendFlag == false) {\r
                        Properties p = (new DB()).getProperties();\r
-                       intlogger.info("HTTPS relaxatio: "+p.get("com.att.research.datarouter.provserver.https.relaxation"));\r
+                       intlogger.info("HTTPS relaxatio: "+p.get("org.onap.dmaap.datarouter.provserver.https.relaxation"));\r
                        \r
-                       if(p.get("com.att.research.datarouter.provserver.https.relaxation").equals("true")) {\r
+                       if(p.get("org.onap.dmaap.datarouter.provserver.https.relaxation").equals("true")) {\r
                            try {\r
-                                 notifyPSTeam(p.get("com.att.research.datarouter.provserver.https.relax.notify").toString());\r
+                                 notifyPSTeam(p.get("org.onap.dmaap.datarouter.provserver.https.relax.notify").toString());\r
                            } \r
                                catch (Exception e) {\r
                                    e.printStackTrace();\r
index bec58cc..14c960c 100644 (file)
@@ -256,7 +256,7 @@ public class InternalServlet extends ProxyServlet {
                }\r
                if (path.startsWith("/logs/")) {\r
                        Properties p = (new DB()).getProperties();\r
-                       String logdir = p.getProperty("com.att.research.datarouter.provserver.accesslog.dir");\r
+                       String logdir = p.getProperty("org.onap.dmaap.datarouter.provserver.accesslog.dir");\r
                        String logfile = path.substring(6);\r
                        if (logdir != null && logfile != null && logfile.indexOf('/') < 0) {\r
                                File log = new File(logdir + "/" + logfile);\r
@@ -399,7 +399,7 @@ public class InternalServlet extends ProxyServlet {
                                eventlogger.info(elr);\r
                                return;\r
                        }\r
-                       String spooldir = (new DB()).getProperties().getProperty("com.att.research.datarouter.provserver.spooldir");\r
+                       String spooldir = (new DB()).getProperties().getProperty("org.onap.dmaap.datarouter.provserver.spooldir");\r
                        String spoolname = String.format("%d-%d-", System.currentTimeMillis(), Thread.currentThread().getId());\r
                        synchronized (logseq) {\r
                                // perhaps unnecessary, but it helps make the name unique\r
@@ -487,7 +487,7 @@ public class InternalServlet extends ProxyServlet {
        private JSONArray generateLogfileList() {\r
                JSONArray ja = new JSONArray();\r
                Properties p = (new DB()).getProperties();\r
-               String s = p.getProperty("com.att.research.datarouter.provserver.accesslog.dir");\r
+               String s = p.getProperty("org.onap.dmaap.datarouter.provserver.accesslog.dir");\r
                if (s != null) {\r
                        String[] dirs = s.split(",");\r
                        for (String dir : dirs) {\r
index f5c93c7..70dbd44 100644 (file)
@@ -82,11 +82,11 @@ import org.onap.dmaap.datarouter.provisioning.utils.ThrottleFilter;
 public class Main {\r
        /** The truststore to use if none is specified */\r
        public static final String DEFAULT_TRUSTSTORE           = "/opt/java/jdk/jdk180/jre/lib/security/cacerts";\r
-       public static final String KEYSTORE_TYPE_PROPERTY       = "com.att.research.datarouter.provserver.keystore.type";\r
-       public static final String KEYSTORE_PATH_PROPERTY       = "com.att.research.datarouter.provserver.keystore.path";\r
-       public static final String KEYSTORE_PASSWORD_PROPERTY   = "com.att.research.datarouter.provserver.keystore.password";\r
-       public static final String TRUSTSTORE_PATH_PROPERTY     = "com.att.research.datarouter.provserver.truststore.path";\r
-       public static final String TRUSTSTORE_PASSWORD_PROPERTY = "com.att.research.datarouter.provserver.truststore.password";\r
+       public static final String KEYSTORE_TYPE_PROPERTY       = "org.onap.dmaap.datarouter.provserver.keystore.type";\r
+       public static final String KEYSTORE_PATH_PROPERTY       = "org.onap.dmaap.datarouter.provserver.keystore.path";\r
+       public static final String KEYSTORE_PASSWORD_PROPERTY   = "org.onap.dmaap.datarouter.provserver.keystore.password";\r
+       public static final String TRUSTSTORE_PATH_PROPERTY     = "org.onap.dmaap.datarouter.provserver.truststore.path";\r
+       public static final String TRUSTSTORE_PASSWORD_PROPERTY = "org.onap.dmaap.datarouter.provserver.truststore.password";\r
 \r
        /** The one and only {@link Server} instance in this JVM */\r
        private static Server server;\r
@@ -108,8 +108,8 @@ public class Main {
 \r
                // Get properties\r
                Properties p = (new DB()).getProperties();\r
-               int http_port  = Integer.parseInt(p.getProperty("com.att.research.datarouter.provserver.http.port", "8080"));\r
-               int https_port = Integer.parseInt(p.getProperty("com.att.research.datarouter.provserver.https.port", "8443"));\r
+               int http_port  = Integer.parseInt(p.getProperty("org.onap.dmaap.datarouter.provserver.http.port", "8080"));\r
+               int https_port = Integer.parseInt(p.getProperty("org.onap.dmaap.datarouter.provserver.https.port", "8443"));\r
 \r
                // HTTP connector\r
                SelectChannelConnector http = new SelectChannelConnector();\r
@@ -138,7 +138,7 @@ public class Main {
                cf.setKeyStoreType(p.getProperty(KEYSTORE_TYPE_PROPERTY, "jks"));\r
                cf.setKeyStorePath(p.getProperty(KEYSTORE_PATH_PROPERTY));\r
                cf.setKeyStorePassword(p.getProperty(KEYSTORE_PASSWORD_PROPERTY));\r
-               cf.setKeyManagerPassword(p.getProperty("com.att.research.datarouter.provserver.keymanager.password"));\r
+               cf.setKeyManagerPassword(p.getProperty("org.onap.dmaap.datarouter.provserver.keymanager.password"));\r
                String ts = p.getProperty(TRUSTSTORE_PATH_PROPERTY);\r
                if (ts != null && ts.length() > 0) {\r
                        System.out.println("@@ TS -> "+ts);\r
@@ -173,7 +173,7 @@ public class Main {
 \r
                // Request log configuration\r
                NCSARequestLog nrl = new NCSARequestLog();\r
-               nrl.setFilename(p.getProperty("com.att.research.datarouter.provserver.accesslog.dir") + "/request.log.yyyy_mm_dd");\r
+               nrl.setFilename(p.getProperty("org.onap.dmaap.datarouter.provserver.accesslog.dir") + "/request.log.yyyy_mm_dd");\r
                nrl.setFilenameDateFormat("yyyyMMdd");\r
                nrl.setRetainDays(90);\r
                nrl.setAppend(true);\r
index a85bfc8..1e5751a 100644 (file)
@@ -130,7 +130,7 @@ public class SynchronizerTask extends TimerTask {
        private SynchronizerTask() {\r
                logger = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
                rolex = new Timer();\r
-               spooldir = (new DB()).getProperties().getProperty("com.att.research.datarouter.provserver.spooldir");\r
+               spooldir = (new DB()).getProperties().getProperty("org.onap.dmaap.datarouter.provserver.spooldir");\r
                state = UNKNOWN;\r
                doFetch = true;         // start off with a fetch\r
                nextsynctime = 0;\r
@@ -172,7 +172,7 @@ public class SynchronizerTask extends TimerTask {
                        // Run once every 5 seconds to check DNS, etc.\r
                        long interval = 0;\r
                        try {\r
-                               String s = props.getProperty("com.att.research.datarouter.provserver.sync_interval", "5000");\r
+                               String s = props.getProperty("org.onap.dmaap.datarouter.provserver.sync_interval", "5000");\r
                                interval = Long.parseLong(s);\r
                        } catch (NumberFormatException e) {\r
                                interval = 5000L;\r
index 056c769..39d859d 100644 (file)
@@ -302,7 +302,7 @@ public class IngressRoute extends NodeClass implements Comparable<IngressRoute>
 \r
        /**\r
         *      Compare IP addresses as byte arrays to a subnet specified as a CIDR.\r
-        *  Taken from com.att.research.datarouter.node.SubnetMatcher and modified somewhat.\r
+        *  Taken from org.onap.dmaap.datarouter.node.SubnetMatcher and modified somewhat.\r
         */\r
        public class SubnetMatcher {\r
                private byte[]  sn;\r
index 7e9f2ca..4084f74 100644 (file)
@@ -213,7 +213,7 @@ public class Subscription extends Syncable {
                        \r
                        //Data Router Subscriber HTTPS Relaxation feature USERSTORYID:US674047.\r
                        Properties p = (new DB()).getProperties();\r
-                       if(p.get("com.att.research.datarouter.provserver.https.relaxation").toString().equals("false") && !jo.has("sync")) {\r
+                       if(p.get("org.onap.dmaap.datarouter.provserver.https.relaxation").toString().equals("false") && !jo.has("sync")) {\r
                                if (!url.startsWith("https://"))\r
                                        throw new InvalidObjectException("delivery URL is not HTTPS");\r
                        }\r
index 7b00931..113b1cc 100644 (file)
@@ -2,7 +2,7 @@
 # ============LICENSE_START==================================================\r
 # * org.onap.dmaap\r
 # * ===========================================================================\r
-# * Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.\r
+# * Copyright ï¿½ 2017 AT&T Intellectual Property. All rights reserved.\r
 # * ===========================================================================\r
 # * Licensed under the Apache License, Version 2.0 (the "License");\r
 # * you may not use this file except in compliance with the License.\r
@@ -39,7 +39,7 @@ URLs are from the document <b>URLs for DR Release 1</b> <i>Version 1.2</i>.
 <tr>\r
        <td class="colFirst" class="colOne">/</td>\r
        <td class="colOne" class="colOne">&lt;drFeedsUrl&gt;</td>\r
-       <td class="colLast" class="colOne">{@link com.att.research.datarouter.provisioning.DRFeedsServlet}</td>\r
+       <td class="colLast" class="colOne">{@link org.onap.dmaap.datarouter.provisioning.DRFeedsServlet}</td>\r
        <td class="colLast" class="colOne" style="background-color: pink">DELETE</td>\r
        <td class="colLast" class="colOne" style="background-color: lightgreen">GET</td>\r
        <td class="colLast" class="colOne" style="background-color: lightgreen">POST</td>\r
@@ -48,7 +48,7 @@ URLs are from the document <b>URLs for DR Release 1</b> <i>Version 1.2</i>.
 <tr class="altColor">\r
        <td class="colFirst" class="colOne">/feed/feedid</td>\r
        <td class="colOne" class="colOne">&lt;feedUrl&gt;</td>\r
-       <td class="colLast" class="colOne">{@link com.att.research.datarouter.provisioning.FeedServlet}</td>\r
+       <td class="colLast" class="colOne">{@link org.onap.dmaap.datarouter.provisioning.FeedServlet}</td>\r
        <td class="colLast" style="background-color: lightgreen">DELETE</td>\r
        <td class="colLast" style="background-color: lightgreen">GET</td>\r
        <td class="colLast" style="background-color: pink">POST</td>\r
@@ -57,7 +57,7 @@ URLs are from the document <b>URLs for DR Release 1</b> <i>Version 1.2</i>.
 <tr>\r
        <td class="colFirst">/publish/feedid</td>\r
        <td class="colOne">&lt;publishUrl&gt;</td>\r
-       <td class="colLast">{@link com.att.research.datarouter.provisioning.PublishServlet}</td>\r
+       <td class="colLast">{@link org.onap.dmaap.datarouter.provisioning.PublishServlet}</td>\r
        <td class="colLast" style="background-color: lightgreen">DELETE</td>\r
        <td class="colLast" style="background-color: lightgreen">GET</td>\r
        <td class="colLast" style="background-color: lightgreen">POST</td>\r
@@ -66,7 +66,7 @@ URLs are from the document <b>URLs for DR Release 1</b> <i>Version 1.2</i>.
 <tr class="altColor">\r
        <td class="colFirst">/subscribe/feedid</td>\r
        <td class="colOne">&lt;subscribeUrl&gt;</td>\r
-       <td class="colLast">{@link com.att.research.datarouter.provisioning.SubscribeServlet}</td>\r
+       <td class="colLast">{@link org.onap.dmaap.datarouter.provisioning.SubscribeServlet}</td>\r
        <td class="colLast" style="background-color: pink">DELETE</td>\r
        <td class="colLast" style="background-color: lightgreen">GET</td>\r
        <td class="colLast" style="background-color: lightgreen">POST</td>\r
@@ -75,7 +75,7 @@ URLs are from the document <b>URLs for DR Release 1</b> <i>Version 1.2</i>.
 <tr>\r
        <td class="colFirst">/feedlog/feedid</td>\r
        <td class="colOne">&lt;feedLogUrl&gt;</td>\r
-       <td class="colLast">{@link com.att.research.datarouter.provisioning.FeedLogServlet}</td>\r
+       <td class="colLast">{@link org.onap.dmaap.datarouter.provisioning.FeedLogServlet}</td>\r
        <td class="colLast" style="background-color: pink">DELETE</td>\r
        <td class="colLast" style="background-color: lightgreen">GET</td>\r
        <td class="colLast" style="background-color: pink">POST</td>\r
@@ -84,7 +84,7 @@ URLs are from the document <b>URLs for DR Release 1</b> <i>Version 1.2</i>.
 <tr class="altColor">\r
        <td class="colFirst">/subs/subid</td>\r
        <td class="colOne">&lt;subscriptionUrl&gt;</td>\r
-       <td class="colLast">{@link com.att.research.datarouter.provisioning.SubscriptionServlet}</td>\r
+       <td class="colLast">{@link org.onap.dmaap.datarouter.provisioning.SubscriptionServlet}</td>\r
        <td class="colLast" style="background-color: lightgreen">DELETE</td>\r
        <td class="colLast" style="background-color: lightgreen">GET</td>\r
        <td class="colLast" style="background-color: lightgreen">POST</td>\r
@@ -93,7 +93,7 @@ URLs are from the document <b>URLs for DR Release 1</b> <i>Version 1.2</i>.
 <tr>\r
        <td class="colFirst">/sublog/subid</td>\r
        <td class="colOne">&lt;subLogUrl&gt;</td>\r
-       <td class="colLast">{@link com.att.research.datarouter.provisioning.SubLogServlet}</td>\r
+       <td class="colLast">{@link org.onap.dmaap.datarouter.provisioning.SubLogServlet}</td>\r
        <td class="colLast" style="background-color: pink">DELETE</td>\r
        <td class="colLast" style="background-color: lightgreen">GET</td>\r
        <td class="colLast" style="background-color: pink">POST</td>\r
@@ -102,7 +102,7 @@ URLs are from the document <b>URLs for DR Release 1</b> <i>Version 1.2</i>.
 <tr class="altColor">\r
        <td class="colFirst">/internal/*</td>\r
        <td class="colOne">&lt;internalUrl&gt;</td>\r
-       <td class="colLast">{@link com.att.research.datarouter.provisioning.InternalServlet}</td>\r
+       <td class="colLast">{@link org.onap.dmaap.datarouter.provisioning.InternalServlet}</td>\r
        <td class="colLast" style="background-color: lightgreen">DELETE</td>\r
        <td class="colLast" style="background-color: lightgreen">GET</td>\r
        <td class="colLast" style="background-color: lightgreen">POST</td>\r
@@ -111,7 +111,7 @@ URLs are from the document <b>URLs for DR Release 1</b> <i>Version 1.2</i>.
 <tr>\r
        <td class="colFirst">/internal/route/*</td>\r
        <td class="colOne">&lt;routeUrl&gt;</td>\r
-       <td class="colLast">{@link com.att.research.datarouter.provisioning.RouteServlet}</td>\r
+       <td class="colLast">{@link org.onap.dmaap.datarouter.provisioning.RouteServlet}</td>\r
        <td class="colLast" style="background-color: lightgreen">DELETE</td>\r
        <td class="colLast" style="background-color: lightgreen">GET</td>\r
        <td class="colLast" style="background-color: lightgreen">POST</td>\r
index 1f558ec..0160571 100644 (file)
@@ -83,12 +83,12 @@ public class DB {
                        InputStream inStream = getClass().getClassLoader().getResourceAsStream(CONFIG_FILE);\r
                        try {\r
                                props.load(inStream);\r
-                               DB_DRIVER   = (String) props.get("com.att.research.datarouter.db.driver");\r
-                               DB_URL      = (String) props.get("com.att.research.datarouter.db.url");\r
-                               DB_LOGIN    = (String) props.get("com.att.research.datarouter.db.login");\r
-                               DB_PASSWORD = (String) props.get("com.att.research.datarouter.db.password");\r
-                               HTTPS_PORT = (String) props.get("com.att.research.datarouter.provserver.https.port");\r
-                               HTTP_PORT = (String) props.get("com.att.research.datarouter.provserver.http.port");\r
+                               DB_DRIVER   = (String) props.get("org.onap.dmaap.datarouter.db.driver");\r
+                               DB_URL      = (String) props.get("org.onap.dmaap.datarouter.db.url");\r
+                               DB_LOGIN    = (String) props.get("org.onap.dmaap.datarouter.db.login");\r
+                               DB_PASSWORD = (String) props.get("org.onap.dmaap.datarouter.db.password");\r
+                               HTTPS_PORT = (String) props.get("org.onap.dmaap.datarouter.provserver.https.port");\r
+                               HTTP_PORT = (String) props.get("org.onap.dmaap.datarouter.provserver.http.port");\r
                                Class.forName(DB_DRIVER);\r
                        } catch (IOException e) {\r
                                intlogger.fatal("PROV9003 Opening properties: "+e.getMessage());\r
@@ -671,13 +671,13 @@ public class DB {
        }\r
        /**\r
         * Initialize the tables by running the initialization scripts located in the directory specified\r
-        * by the property <i>com.att.research.datarouter.provserver.dbscripts</i>.  Scripts have names of\r
+        * by the property <i>org.onap.dmaap.datarouter.provserver.dbscripts</i>.  Scripts have names of\r
         * the form mysql_init_NNNN.\r
         * @param c a DB connection\r
         * @param n the number of the mysql_init_NNNN script to run\r
         */\r
        private void runInitScript(Connection c, int n) {\r
-               String scriptdir = (String) props.get("com.att.research.datarouter.provserver.dbscripts");\r
+               String scriptdir = (String) props.get("org.onap.dmaap.datarouter.provserver.dbscripts");\r
                StringBuilder sb = new StringBuilder();\r
                try {\r
                        String scriptfile = String.format("%s/mysql_init_%04d", scriptdir, n);\r
index 4c98f8e..a3f4b32 100644 (file)
@@ -113,8 +113,8 @@ public class DRRouteCLI {
                this.httpclient = new DefaultHttpClient();\r
 \r
                Properties p = (new DB()).getProperties();\r
-               String truststore_file = p.getProperty("com.att.research.datarouter.provserver.truststore.path");\r
-               String truststore_pw   = p.getProperty("com.att.research.datarouter.provserver.truststore.password");\r
+               String truststore_file = p.getProperty("org.onap.dmaap.datarouter.provserver.truststore.path");\r
+               String truststore_pw   = p.getProperty("org.onap.dmaap.datarouter.provserver.truststore.password");\r
 \r
                KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());\r
                if (truststore_file == null || truststore_file.equals("")) {\r
index b19bee1..830e21c 100644 (file)
@@ -107,7 +107,7 @@ public class LogfileLoader extends Thread {
        private LogfileLoader() {\r
                this.logger   = Logger.getLogger("org.onap.dmaap.datarouter.provisioning.internal");\r
                this.db       = new DB();\r
-               this.spooldir = db.getProperties().getProperty("com.att.research.datarouter.provserver.spooldir");\r
+               this.spooldir = db.getProperties().getProperty("org.onap.dmaap.datarouter.provserver.spooldir");\r
                this.set_start = getIdRange();\r
                this.set_end   = set_start + SET_SIZE - 1;\r
                this.seq_set  = new RLEBitSet();\r
index 5a5d550..8cfce5c 100644 (file)
@@ -30,7 +30,7 @@ import java.util.TimerTask;
 \r
 /**\r
  * This class provides a {@link TimerTask} that purges old logfiles\r
- * (older than the number of days specified by the com.att.research.datarouter.provserver.logretention property).\r
+ * (older than the number of days specified by the org.onap.dmaap.datarouter.provserver.logretention property).\r
  * @author Robert Eby\r
  * @version $Id: PurgeLogDirTask.java,v 1.2 2013/07/05 13:48:05 eby Exp $\r
  */\r
@@ -42,8 +42,8 @@ public class PurgeLogDirTask extends TimerTask {
 \r
        public PurgeLogDirTask() {\r
                Properties p = (new DB()).getProperties();\r
-               logdir   = p.getProperty("com.att.research.datarouter.provserver.accesslog.dir");\r
-               String s = p.getProperty("com.att.research.datarouter.provserver.logretention", "30");\r
+               logdir   = p.getProperty("org.onap.dmaap.datarouter.provserver.accesslog.dir");\r
+               String s = p.getProperty("org.onap.dmaap.datarouter.provserver.logretention", "30");\r
                long n = 30;\r
                try {\r
                        n = Long.parseLong(s);\r
index 2c2d26b..88c3d5e 100644 (file)
@@ -2,7 +2,7 @@
 # ============LICENSE_START==================================================\r
 # * org.onap.dmaap\r
 # * ===========================================================================\r
-# * Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.\r
+# * Copyright ï¿½ 2017 AT&T Intellectual Property. All rights reserved.\r
 # * ===========================================================================\r
 # * Licensed under the Apache License, Version 2.0 (the "License");\r
 # * you may not use this file except in compliance with the License.\r
@@ -33,11 +33,11 @@ The classes in this package, and the reports they generate are:
 </p>\r
 <table>\r
 <tr><th>Class</th><th>Report</th></tr>\r
-<tr><td>{@link com.att.research.datarouter.reports.DailyLatencyReport}</td><td>dailylatency.csv</td></tr>\r
-<tr><td>{@link com.att.research.datarouter.reports.FeedReport}</td><td>NOT CURRENTLY USED</td></tr>\r
-<tr><td>{@link com.att.research.datarouter.reports.LatencyReport}</td><td></td></tr>\r
-<tr><td>{@link com.att.research.datarouter.reports.SubscriberReport}</td><td>subscriber.csv</td></tr>\r
-<tr><td>{@link com.att.research.datarouter.reports.VolumeReport}</td><td>volumes.csv</td></tr>\r
+<tr><td>{@link org.onap.dmaap.datarouter.reports.DailyLatencyReport}</td><td>dailylatency.csv</td></tr>\r
+<tr><td>{@link org.onap.dmaap.datarouter.reports.FeedReport}</td><td>NOT CURRENTLY USED</td></tr>\r
+<tr><td>{@link org.onap.dmaap.datarouter.reports.LatencyReport}</td><td></td></tr>\r
+<tr><td>{@link org.onap.dmaap.datarouter.reports.SubscriberReport}</td><td>subscriber.csv</td></tr>\r
+<tr><td>{@link org.onap.dmaap.datarouter.reports.VolumeReport}</td><td>volumes.csv</td></tr>\r
 </table>\r
 </body>\r
 </html>\r
index 4e2a81a..1c33e3b 100644 (file)
 # * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
 # *\r
 #-------------------------------------------------------------------------------\r
-version: '2'\r
+version: '2.1'\r
 services: \r
   datarouter-prov:\r
-    image: attos/datarouter-prov\r
+    image: onap/dmaap/datarouter-prov\r
     container_name: datarouter-prov\r
     hostname: prov.datarouternew.com\r
     ports:\r
@@ -36,13 +36,13 @@ services:
 #      - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt\r
     entrypoint: ["bash", "-c", "sleep 10; /bin/sh -c ./startup.sh"]\r
     depends_on:\r
-      - mysql_container\r
+      mysql_container:\r
+        condition: service_healthy\r
     extra_hosts:\r
       - "node.datarouternew.com:172.18.0.4"\r
-\r
     \r
   datarouter-node:\r
-    image: attos/datarouter-node\r
+    image: onap/dmaap/datarouter-node\r
     container_name: datarouter-node\r
     hostname: node.datarouternew.com\r
     ports:\r
@@ -60,10 +60,10 @@ services:
     image: mysql/mysql-server:5.6\r
     container_name: mysql\r
     ports:\r
-     - "3306:3306"\r
+      - "3306:3306"\r
     environment:\r
       MYSQL_ROOT_PASSWORD: att2017\r
     volumes:\r
-    - ./database:/tmp/database\r
-    - ./database:/docker-entrypoint-initdb.d\r
+      - ./database:/tmp/database\r
+      - ./database:/docker-entrypoint-initdb.d\r
     \r
index 6a03cbd..b722a64 100644 (file)
@@ -2,7 +2,7 @@
 # ============LICENSE_START==================================================\r
 # * org.onap.dmaap\r
 # * ===========================================================================\r
-# * Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.\r
+# * Copyright ï¿½ 2017 AT&T Intellectual Property. All rights reserved.\r
 # * ===========================================================================\r
 # * Licensed under the Apache License, Version 2.0 (the "License");\r
 # * you may not use this file except in compliance with the License.\r
 # * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
 # *\r
 #-------------------------------------------------------------------------------\r
-#\r
-#                        AT&T - PROPRIETARY\r
-#          THIS FILE CONTAINS PROPRIETARY INFORMATION OF\r
-#        AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN\r
-#             ACCORDANCE WITH APPLICABLE AGREEMENTS.\r
-#\r
-#          Copyright (c) 2013 AT&T Knowledge Ventures\r
-#              Unpublished and Not for Publication\r
-#                     All Rights Reserved\r
-#\r
-# CVS: $Id: provserver.properties,v 1.7 2013/05/29 14:44:36 eby Exp $\r
-#\r
+\r
 \r
 #Jetty Server properties\r
-com.att.research.datarouter.provserver.http.port           = 8080\r
-com.att.research.datarouter.provserver.https.port          = 8443\r
-com.att.research.datarouter.provserver.https.relaxation           = true\r
-com.att.research.datarouter.provserver.keymanager.password = changeit\r
-com.att.research.datarouter.provserver.keystore.type       = jks\r
-com.att.research.datarouter.provserver.keystore.path       = /opt/app/datartr/self_signed/keystore.jks\r
+org.onap.dmaap.datarouter.provserver.http.port           = 8080\r
+org.onap.dmaap.datarouter.provserver.https.port          = 8443\r
+org.onap.dmaap.datarouter.provserver.https.relaxation     = false\r
+org.onap.dmaap.datarouter.provserver.keymanager.password = changeit\r
+org.onap.dmaap.datarouter.provserver.keystore.type       = jks\r
+org.onap.dmaap.datarouter.provserver.keystore.path       = /opt/app/datartr/self_signed/keystore.jks\r
 \r
-com.att.research.datarouter.provserver.keystore.password   = changeit\r
-#com.att.research.datarouter.provserver.truststore.path     = /home/eby/dr2/misc/cacerts+1\r
-#com.att.research.datarouter.provserver.truststore.path     = /usr/lib/jvm/java-8-oracle/jre/lib/security/cacerts\r
-com.att.research.datarouter.provserver.truststore.path     = /opt/app/datartr/self_signed/cacerts.jks\r
+org.onap.dmaap.datarouter.provserver.keystore.password   = changeit\r
+#org.onap.dmaap.datarouter.provserver.truststore.path     = /home/eby/dr2/misc/cacerts+1\r
+#org.onap.dmaap.datarouter.provserver.truststore.path     = /usr/lib/jvm/java-8-oracle/jre/lib/security/cacerts\r
+org.onap.dmaap.datarouter.provserver.truststore.path     = /opt/app/datartr/self_signed/cacerts.jks\r
 \r
-com.att.research.datarouter.provserver.truststore.password = changeit\r
-com.att.research.datarouter.provserver.accesslog.dir       = /opt/app/datartr/logs\r
-com.att.research.datarouter.provserver.spooldir            = /opt/app/datartr/spool\r
-#com.att.research.datarouter.provserver.dbscripts          = /home/eby/dr2/cvs/datarouter/prov/misc/\r
-com.att.research.datarouter.provserver.logretention        = 30\r
+org.onap.dmaap.datarouter.provserver.truststore.password = changeit\r
+org.onap.dmaap.datarouter.provserver.accesslog.dir       = /opt/app/datartr/logs\r
+org.onap.dmaap.datarouter.provserver.spooldir            = /opt/app/datartr/spool\r
+#org.onap.dmaap.datarouter.provserver.dbscripts          = /home/eby/dr2/cvs/datarouter/prov/misc/\r
+org.onap.dmaap.datarouter.provserver.logretention        = 30\r
 \r
 # Database access\r
-com.att.research.datarouter.db.driver   = com.mysql.jdbc.Driver\r
-com.att.research.datarouter.db.url      = jdbc:mysql://172.18.0.2:3306/datarouter\r
-com.att.research.datarouter.db.login    = datarouter\r
-com.att.research.datarouter.db.password = datarouter\r
+org.onap.dmaap.datarouter.db.driver   = com.mysql.jdbc.Driver\r
+org.onap.dmaap.datarouter.db.url      = jdbc:mysql://172.18.0.2:3306/datarouter\r
+org.onap.dmaap.datarouter.db.login    = datarouter\r
+org.onap.dmaap.datarouter.db.password = datarouter\r
index 191a804..e964f66 100644 (file)
@@ -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
index bb4eaa0..15ba888 100644 (file)
@@ -2,7 +2,7 @@
 # ============LICENSE_START==================================================\r
 # * org.onap.dmaap\r
 # * ===========================================================================\r
-# * Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.\r
+# * Copyright ï¿½ 2017 AT&T Intellectual Property. All rights reserved.\r
 # * ===========================================================================\r
 # * Licensed under the Apache License, Version 2.0 (the "License");\r
 # * you may not use this file except in compliance with the License.\r
@@ -31,8 +31,8 @@ log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] - %m%n
 #\r
 # Logger used for provisioning events\r
 #\r
-log4j.logger.com.att.research.datarouter.provisioning.events=info, eventlog\r
-log4j.additivity.com.att.research.datarouter.provisioning.events=false\r
+log4j.logger.org.onap.dmaap.datarouter.provisioning.events=info, eventlog\r
+log4j.additivity.org.onap.dmaap.datarouter.provisioning.events=false\r
 \r
 log4j.appender.eventlog=org.apache.log4j.DailyRollingFileAppender\r
 log4j.appender.eventlog.file=/root/dr2/logs/provevent.log\r
@@ -44,8 +44,8 @@ log4j.appender.eventlog.layout.ConversionPattern=%d %-5p [%t] - %m%n
 #\r
 # Logger used for internal provisioning server events\r
 #\r
-log4j.logger.com.att.research.datarouter.provisioning.internal=debug, intlog\r
-log4j.additivity.com.att.research.datarouter.provisioning.internal=false\r
+log4j.logger.org.onap.dmaap.datarouter.provisioning.internal=debug, intlog\r
+log4j.additivity.org.onap.dmaap.datarouter.provisioning.internal=false\r
 \r
 log4j.appender.intlog=org.apache.log4j.DailyRollingFileAppender\r
 log4j.appender.intlog.file=/root/dr2/logs/provint.log\r
@@ -57,8 +57,8 @@ log4j.appender.intlog.layout.ConversionPattern=%d %-5p [%t] - %m%n
 #\r
 # Logger used for policy engine\r
 #\r
-log4j.logger.com.att.research.datarouter.authz.impl.ProvAuthorizer=debug, pelog\r
-log4j.additivity.com.att.research.datarouter.authz.impl.ProvAuthorizer=false\r
+log4j.logger.org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer=debug, pelog\r
+log4j.additivity.org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer=false\r
 \r
 log4j.appender.pelog=org.apache.log4j.DailyRollingFileAppender\r
 log4j.appender.pelog.file=/root/dr2/logs/policyengine.log\r
index 7d73e0d..a965515 100644 (file)
    <appender name="jettylog"\r
     class="ch.qos.logback.core.rolling.RollingFileAppender">\r
     <file>${logDirectory}/${jettyLogName}.log</file>\r
-        <filter class="com.att.research.datarouter.provisioning.eelf.JettyFilter" />\r
+        <filter class="org.onap.dmaap.datarouter.provisioning.eelf.JettyFilter" />\r
     <rollingPolicy\r
       class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">\r
       <fileNamePattern>${logDirectory}/${jettyLogName}.%i.log.zip\r
index 4319332..8e719d4 100644 (file)
@@ -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 "$@"
index 77c6c18..56d7766 100644 (file)
@@ -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 $*
index c801ce0..2afb6ec 100644 (file)
@@ -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" = "" ]
index 4ff4278..57d93c8 100644 (file)
@@ -2,7 +2,7 @@
 # ============LICENSE_START==================================================\r
 # * org.onap.dmaap\r
 # * ===========================================================================\r
-# * Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.\r
+# * Copyright ï¿½ 2017 AT&T Intellectual Property. All rights reserved.\r
 # * ===========================================================================\r
 # * Licensed under the Apache License, Version 2.0 (the "License");\r
 # * you may not use this file except in compliance with the License.\r
 # *\r
 # * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
 # *\r
-#-------------------------------------------------------------------------------\r
-#\r
-#                        AT&T - PROPRIETARY\r
-#          THIS FILE CONTAINS PROPRIETARY INFORMATION OF\r
-#        AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN\r
-#             ACCORDANCE WITH APPLICABLE AGREEMENTS.\r
-#\r
-#          Copyright (c) 2013 AT&T Knowledge Ventures\r
-#              Unpublished and Not for Publication\r
-#                     All Rights Reserved\r
-#\r
-# CVS: $Id: log4j.drroute.properties,v 1.1 2013/11/06 16:23:54 eby Exp $\r
-#      This log4j properties file is used only by dr-route\r
-#\r
 \r
 log4j.rootLogger=INFO, stdout\r
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender\r
index ed1d7fa..304ee17 100644 (file)
@@ -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
index 63efa54..b48084f 100644 (file)
@@ -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"
index 009b749..170d6ef 100644 (file)
@@ -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 ' ' ':'`
index af5073e..b722a64 100644 (file)
@@ -2,7 +2,7 @@
 # ============LICENSE_START==================================================\r
 # * org.onap.dmaap\r
 # * ===========================================================================\r
-# * Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.\r
+# * Copyright ï¿½ 2017 AT&T Intellectual Property. All rights reserved.\r
 # * ===========================================================================\r
 # * Licensed under the Apache License, Version 2.0 (the "License");\r
 # * you may not use this file except in compliance with the License.\r
 \r
 \r
 #Jetty Server properties\r
-com.att.research.datarouter.provserver.http.port           = 8080\r
-com.att.research.datarouter.provserver.https.port          = 8443\r
-com.att.research.datarouter.provserver.https.relaxation           = true\r
-com.att.research.datarouter.provserver.keymanager.password = changeit\r
-com.att.research.datarouter.provserver.keystore.type       = jks\r
-com.att.research.datarouter.provserver.keystore.path       = /opt/app/datartr/self_signed/keystore.jks\r
+org.onap.dmaap.datarouter.provserver.http.port           = 8080\r
+org.onap.dmaap.datarouter.provserver.https.port          = 8443\r
+org.onap.dmaap.datarouter.provserver.https.relaxation     = false\r
+org.onap.dmaap.datarouter.provserver.keymanager.password = changeit\r
+org.onap.dmaap.datarouter.provserver.keystore.type       = jks\r
+org.onap.dmaap.datarouter.provserver.keystore.path       = /opt/app/datartr/self_signed/keystore.jks\r
 \r
-com.att.research.datarouter.provserver.keystore.password   = changeit\r
-#com.att.research.datarouter.provserver.truststore.path     = /home/eby/dr2/misc/cacerts+1\r
-#com.att.research.datarouter.provserver.truststore.path     = /usr/lib/jvm/java-8-oracle/jre/lib/security/cacerts\r
-com.att.research.datarouter.provserver.truststore.path     = /opt/app/datartr/self_signed/cacerts.jks\r
+org.onap.dmaap.datarouter.provserver.keystore.password   = changeit\r
+#org.onap.dmaap.datarouter.provserver.truststore.path     = /home/eby/dr2/misc/cacerts+1\r
+#org.onap.dmaap.datarouter.provserver.truststore.path     = /usr/lib/jvm/java-8-oracle/jre/lib/security/cacerts\r
+org.onap.dmaap.datarouter.provserver.truststore.path     = /opt/app/datartr/self_signed/cacerts.jks\r
 \r
-com.att.research.datarouter.provserver.truststore.password = changeit\r
-com.att.research.datarouter.provserver.accesslog.dir       = /opt/app/datartr/logs\r
-com.att.research.datarouter.provserver.spooldir            = /opt/app/datartr/spool\r
-#com.att.research.datarouter.provserver.dbscripts          = /home/eby/dr2/cvs/datarouter/prov/misc/\r
-com.att.research.datarouter.provserver.logretention        = 30\r
+org.onap.dmaap.datarouter.provserver.truststore.password = changeit\r
+org.onap.dmaap.datarouter.provserver.accesslog.dir       = /opt/app/datartr/logs\r
+org.onap.dmaap.datarouter.provserver.spooldir            = /opt/app/datartr/spool\r
+#org.onap.dmaap.datarouter.provserver.dbscripts          = /home/eby/dr2/cvs/datarouter/prov/misc/\r
+org.onap.dmaap.datarouter.provserver.logretention        = 30\r
 \r
 # Database access\r
-com.att.research.datarouter.db.driver   = com.mysql.jdbc.Driver\r
-com.att.research.datarouter.db.url      = jdbc:mysql://172.18.0.2:3306/datarouter\r
-com.att.research.datarouter.db.login    = datarouter\r
-com.att.research.datarouter.db.password = datarouter\r
+org.onap.dmaap.datarouter.db.driver   = com.mysql.jdbc.Driver\r
+org.onap.dmaap.datarouter.db.url      = jdbc:mysql://172.18.0.2:3306/datarouter\r
+org.onap.dmaap.datarouter.db.login    = datarouter\r
+org.onap.dmaap.datarouter.db.password = datarouter\r
diff --git a/pom.xml b/pom.xml
index 5694cb7..e6dd36c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
   * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
   *\r
 -->\r
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-  <modelVersion>4.0.0</modelVersion>\r
-  <groupId>org.onap.dmaap.datarouter</groupId>\r
-  <artifactId>parent</artifactId>\r
-  <name>dmaap-datarouter</name>\r
-  <version>1.0.1-SNAPSHOT</version>\r
-  <packaging>pom</packaging>\r
-  <url>https://github.com/att/DMAAP_DATAROUTER</url>\r
\r
-  \r
-  <parent>\r
-       <groupId>org.onap.oparent</groupId>\r
-       <artifactId>oparent</artifactId>\r
-       <version>0.1.1</version>\r
-  </parent>\r
-       \r
-  <properties>\r
-  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-               <maven.compiler.source>1.8</maven.compiler.source>\r
-               <maven.compiler.target>1.8</maven.compiler.target>\r
-               <sonar.language>java</sonar.language>\r
-                       <sonar.skip>false</sonar.skip>\r
-               <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
-               <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
-               <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
-               <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
-               <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
-               <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
-               <nexusproxy>https://nexus.onap.org</nexusproxy>\r
-               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
-               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
-               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/org/onap/datarouter/${project.artifactId}/${project.version}</sitePath>\r
-       </properties>\r
-       \r
-       \r
-  <modules>\r
-  <module>datarouter-prov</module>\r
-  <module>datarouter-node</module>\r
-  </modules>\r
-  \r
-  <build>\r
-  <plugins>\r
-  <plugin>\r
-               <groupId>org.sonatype.plugins</groupId>\r
-               <artifactId>nexus-staging-maven-plugin</artifactId>\r
-               <version>1.6.7</version>\r
-               <extensions>true</extensions>\r
-                       <configuration>\r
-                               <nexusUrl>${nexusproxy}</nexusUrl>\r
-                               <stagingProfileId>176c31dfe190a</stagingProfileId>\r
-                               <serverId>ecomp-staging</serverId>\r
-                       </configuration>\r
-       </plugin>\r
-       \r
-       <plugin>\r
-                               <groupId>org.sonatype.plugins</groupId>\r
-                               <artifactId>nexus-staging-maven-plugin</artifactId>\r
-                               <version>1.6.7</version>\r
-                               <extensions>true</extensions>\r
-                               <configuration>\r
-                                       <nexusUrl>${nexusproxy}</nexusUrl>\r
-                                       <stagingProfileId>176c31dfe190a</stagingProfileId>\r
-                                       <serverId>ecomp-staging</serverId>\r
-                               </configuration>\r
-                       </plugin>\r
-                       \r
-                       <plugin>\r
-          <groupId>org.jacoco</groupId>\r
-          <artifactId>jacoco-maven-plugin</artifactId>\r
-          <version>${jacoco.version}</version>\r
-          <configuration>\r
-            <excludes>\r
-              <exclude>**/gen/**</exclude>\r
-              <exclude>**/generated-sources/**</exclude>\r
-              <exclude>**/yang-gen/**</exclude>\r
-              <exclude>**/pax/**</exclude>\r
-            </excludes>\r
-          </configuration>\r
-          <executions>\r
-\r
-            <execution>\r
-              <id>pre-unit-test</id>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
-                <propertyName>surefireArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-            \r
-       \r
-            <execution>\r
-              <id>post-unit-test</id>\r
-              <phase>test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-            <execution>\r
-              <id>pre-integration-test</id>\r
-              <phase>pre-integration-test</phase>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
-\r
-                <propertyName>failsafeArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-\r
-       \r
-            <execution>\r
-              <id>post-integration-test</id>\r
-              <phase>post-integration-test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-          </executions>\r
-        </plugin>\r
-       </plugins>\r
-  </build>\r
- <distributionManagement>\r
-               <repository>\r
-                       <id>ecomp-releases</id>\r
-                       <name>DR Release Repository</name>\r
-                       <url>${nexusproxy}${releaseNexusPath}</url>\r
-               </repository>\r
-               <snapshotRepository>\r
-                       <id>ecomp-snapshots</id>\r
-                       <name>DR Snapshot Repository</name>\r
-                       <url>${nexusproxy}${snapshotNexusPath}</url>\r
-               </snapshotRepository>\r
-               <site>\r
-                       <id>ecomp-site</id>\r
-                       <url>dav:${nexusproxy}${sitePath}</url>\r
-               </site>\r
-       </distributionManagement>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <groupId>org.onap.dmaap.datarouter</groupId>\r
+    <artifactId>parent</artifactId>\r
+    <name>dmaap-datarouter</name>\r
+    <version>1.0.1-SNAPSHOT</version>\r
+    <packaging>pom</packaging>\r
+    <url>https://github.com/att/DMAAP_DATAROUTER</url>\r
+    <parent>\r
+        <groupId>org.onap.oparent</groupId>\r
+        <artifactId>oparent</artifactId>\r
+        <version>0.1.1</version>\r
+    </parent>\r
+    <properties>\r
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+        <maven.compiler.source>1.8</maven.compiler.source>\r
+        <maven.compiler.target>1.8</maven.compiler.target>\r
+        <sonar.language>java</sonar.language>\r
+        <sonar.skip>false</sonar.skip>\r
+        <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
+        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
+        <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
+        <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
+        <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>\r
+        <nexusproxy>https://nexus.onap.org</nexusproxy>\r
+        <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
+        <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
+        <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
+        <sitePath>/content/sites/site/org/onap/dmaap/datarouter/${project.artifactId}/${project.version}</sitePath>\r
+    </properties>\r
+    <modules>\r
+        <module>datarouter-prov</module>\r
+        <module>datarouter-node</module>\r
+    </modules>\r
+    <build>\r
+        <plugins>\r
+            <plugin>\r
+                <groupId>org.sonatype.plugins</groupId>\r
+                <artifactId>nexus-staging-maven-plugin</artifactId>\r
+                <version>1.6.7</version>\r
+                <extensions>true</extensions>\r
+                <configuration>\r
+                    <nexusUrl>${nexusproxy}</nexusUrl>\r
+                    <stagingProfileId>176c31dfe190a</stagingProfileId>\r
+                    <serverId>ecomp-staging</serverId>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.sonatype.plugins</groupId>\r
+                <artifactId>nexus-staging-maven-plugin</artifactId>\r
+                <version>1.6.7</version>\r
+                <extensions>true</extensions>\r
+                <configuration>\r
+                    <nexusUrl>${nexusproxy}</nexusUrl>\r
+                    <stagingProfileId>176c31dfe190a</stagingProfileId>\r
+                    <serverId>ecomp-staging</serverId>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.jacoco</groupId>\r
+                <artifactId>jacoco-maven-plugin</artifactId>\r
+                <version>${jacoco.version}</version>\r
+                <configuration>\r
+                    <excludes>\r
+                        <exclude>**/gen/**</exclude>\r
+                        <exclude>**/generated-sources/**</exclude>\r
+                        <exclude>**/yang-gen/**</exclude>\r
+                        <exclude>**/pax/**</exclude>\r
+                    </excludes>\r
+                </configuration>\r
+                <executions>\r
+                    <execution>\r
+                        <id>pre-unit-test</id>\r
+                        <goals>\r
+                            <goal>prepare-agent</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
+                            <propertyName>surefireArgLine</propertyName>\r
+                        </configuration>\r
+                    </execution>\r
+                    <execution>\r
+                        <id>post-unit-test</id>\r
+                        <phase>test</phase>\r
+                        <goals>\r
+                            <goal>report</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
+                        </configuration>\r
+                    </execution>\r
+                    <execution>\r
+                        <id>pre-integration-test</id>\r
+                        <phase>pre-integration-test</phase>\r
+                        <goals>\r
+                            <goal>prepare-agent</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
+                            <propertyName>failsafeArgLine</propertyName>\r
+                        </configuration>\r
+                    </execution>\r
+                    <execution>\r
+                        <id>post-integration-test</id>\r
+                        <phase>post-integration-test</phase>\r
+                        <goals>\r
+                            <goal>report</goal>\r
+                        </goals>\r
+                        <configuration>\r
+                            <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
+                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
+                        </configuration>\r
+                    </execution>\r
+                </executions>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+    <distributionManagement>\r
+        <repository>\r
+            <id>ecomp-releases</id>\r
+            <name>DR Release Repository</name>\r
+            <url>${nexusproxy}${releaseNexusPath}</url>\r
+        </repository>\r
+        <snapshotRepository>\r
+            <id>ecomp-snapshots</id>\r
+            <name>DR Snapshot Repository</name>\r
+            <url>${nexusproxy}${snapshotNexusPath}</url>\r
+        </snapshotRepository>\r
+        <site>\r
+            <id>ecomp-site</id>\r
+            <url>dav:${nexusproxy}${sitePath}</url>\r
+        </site>\r
+    </distributionManagement>\r
     <pluginRepositories>\r
         <pluginRepository>\r
             <id>onap-plugin-snapshots</id>\r
             <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
         </pluginRepository>\r
     </pluginRepositories>\r
-  \r
-</project>\r
+</project>
\ No newline at end of file