Divide into module dependecy

Add dependency build of dmaapClients and aaiClients.
This modules are mandatory to prh application.

Issue-ID: DCAEGEN2-407

Change-Id: I2150a15d76e81dd01503f44339ddb3c50f5b0348
Signed-off-by: wasala <przemyslaw.wasala@nokia.com>

21 files changed, 435 insertions, 85 deletions

diff --git a/.gitignore b/.gitignore
index f56704bd..691c9f04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,15 @@
+# Compiled class file
 *.class
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
 # Package Files #
 *.jar
 *.war
@@ -15,4 +22,7 @@ hs_err_pid*
 .idea
 *.iml
 
-target
\ No newline at end of file
+target
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 089a1a0a..3b17ffa0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,20 @@
   <version>1.0.0-SNAPSHOT</version>
   <name>pnf-registration-handler</name>
   <description>pnf-registration-handler</description>
+  <packaging>pom</packaging>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
     <!-- Java version-->
     <java.version>8</java.version>
     <compiler.plugin.version>3.7.0</compiler.plugin.version>
@@ -33,6 +45,7 @@
       content/sites/site/org/onap/dcaegen2/services/prh/${project.artifactId}/${project.version}
     </site.path>
   </properties>
+
   <pluginRepositories>
     <!-- Black Duck plugin dependencies -->
     <pluginRepository>
@@ -46,27 +59,24 @@
       <url>http://maven.restlet.com</url>
     </pluginRepository>
   </pluginRepositories>
+
   <repositories>
     <repository>
       <id>external-repository</id>
       <url>https://oss.sonatype.org/content/repositories</url>
     </repository>
   </repositories>
+
   <dependencies>
-    <!--Development tools dependencies-->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
     <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-webflux</artifactId>
+      <groupId>org.immutables</groupId>
+      <artifactId>value</artifactId>
+      <version>2.5.6</version>
     </dependency>
-    <dependency>
-    <groupId>org.immutables</groupId>
-    <artifactId>value</artifactId>
-    <version>2.5.6</version>
-  </dependency>
+
+    <!-- LOGGING dependencies> -->
+
+
     <!-- Testing tools dependencies -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -100,9 +110,21 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
   <build>
+
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-webdav-jackrabbit</artifactId>
+        <version>3.0.0</version>
+      </extension>
+    </extensions>
+
     <pluginManagement>
       <plugins>
+
+        <!-- COMPILER PLUGIN -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
@@ -114,34 +136,83 @@
             <showDeprecation>true</showDeprecation>
           </configuration>
         </plugin>
-        <!-- Package an Uber jar -->
+
+        <!-- MAVEN SOURCE PLUGIN -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>3.0.1</version>
+          <configuration>
+            <excludeResources>true</excludeResources>
+          </configuration>
+          <executions>
+            <execution>
+              <id>attach-sources</id>
+              <phase>verify</phase>
+              <goals>
+                <goal>jar-no-fork</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+        <!-- MAVEN JAVADOC PLUGIN -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>3.1.0</version>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.0.0</version>
+          <configuration>
+            <!-- minimize console output messages -->
+            <quiet>true</quiet>
+            <verbose>false</verbose>
+            <useStandardDocletOptions>false</useStandardDocletOptions>
+          </configuration>
           <executions>
             <execution>
+              <id>aggregate</id>
+              <phase>site</phase>
+              <goals>
+                <goal>aggregate</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>attach-javadoc</id>
+              <goals>
+                <goal>jar</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+        <!-- MAVEN BUNDLE PLUGIN -->
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>3.5.0</version>
+          <extensions>true</extensions>
+          <configuration>
+            <instructions>
+              <Embed-Dependency>*;inline=false;scope=compile</Embed-Dependency>
+              <Embed-Transitive>true</Embed-Transitive>
+              <Embed-Directory>lib</Embed-Directory>
+            </instructions>
+          </configuration>
+          <executions>
+            <execution>
+              <id>Bundling PRH Jar</id>
               <phase>package</phase>
               <goals>
-                <goal>shade</goal>
+                <goal>bundle</goal>
               </goals>
-              <configuration>
-                <transformers>
-                  <transformer
-                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                  <transformer
-                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                    <mainClass>org.onap.dcaegen2.services.prh.ServerPrhApp</mainClass>
-                  </transformer>
-                </transformers>
-              </configuration>
             </execution>
           </executions>
         </plugin>
+
+        <!-- MAVEN AUTO RUN PLUGIN -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.6</version>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.8</version>
         </plugin>
 
         <!--  maven-surefire-plugin which is used during the test phase of build lifecycle -->
@@ -149,6 +220,35 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.19.1</version>
+          <configuration>
+            <skipTests>false</skipTests>
+            <argLine>-Xmx2048m -Djava.awt.headless=true -XX:+UseConcMarkSweepGC
+              -XX:OnOutOfMemoryError="kill -9 %p" -XX:+HeapDumpOnOutOfMemoryError
+            </argLine>
+            <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}
+            </redirectTestOutputToFile>
+            <parallel>methods</parallel>
+            <threadCount>8</threadCount>
+            <forkCount>8</forkCount>
+            <reuseForks>true</reuseForks>
+            <reportFormat>xml</reportFormat>
+            <trimStackTrace>false</trimStackTrace>
+            <systemPropertyVariables>
+              <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+              <logback.configurationFile>
+                ${basedir}/src/test/resources/logback-test.xml
+              </logback.configurationFile>
+              <HADOOP_HOME>${project.build.directory}</HADOOP_HOME>
+            </systemPropertyVariables>
+            <includes>
+              <include>**/*Test.java</include>
+            </includes>
+            <excludes>
+              <exclude>**/*IT.java</exclude>
+            </excludes>
+            <!-- Sets the VM argument line used when unit tests are run. -->
+            <argLine>${surefireArgLine}</argLine>
+          </configuration>
           <dependencies>
             <dependency>
               <groupId>org.junit.platform</groupId>
@@ -157,6 +257,77 @@
             </dependency>
           </dependencies>
         </plugin>
+
+        <!-- FIND BUGS (STATIC CODE ANALYSIS) PLUGIN -->
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>findbugs-maven-plugin</artifactId>
+          <version>${findbugs.plugin.version}</version>
+          <configuration>
+            <effort>Max</effort>
+            <threshold>Low</threshold>
+            <xmlOutput>true</xmlOutput>
+            <!-- BUILD FAIL ON FINDBUGS ERRORS -->
+            <failOnError>true</failOnError>
+            <excludeFilterFile>${project.basedir}/findbugs-exclude.xml</excludeFilterFile>
+            <outputDirectory>${project.reporting.outputDirectory}/findbugs</outputDirectory>
+            <findbugsXmlOutputDirectory>${project.reporting.outputDirectory}/findbugs
+            </findbugsXmlOutputDirectory>
+          </configuration>
+          <executions>
+            <execution>
+              <id>analyze-compile</id>
+              <phase>compile</phase>
+              <goals>
+                <goal>check</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.0.2</version>
+          <configuration>
+            <archive>
+              <manifest>
+                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              </manifest>
+              <manifestEntries>
+                <Implementation-Build-Version>${project.version}</Implementation-Build-Version>
+              </manifestEntries>
+            </archive>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.6</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jxr-plugin</artifactId>
+          <version>2.5</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>2.9</version>
+          <configuration>
+            <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+            <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-report-plugin</artifactId>
+          <version>2.21.0</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -164,14 +335,58 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
+
       <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+
     </plugins>
   </build>
+
   <reporting>
     <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
@@ -191,17 +406,10 @@
     </plugins>
   </reporting>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <!-- Import dependency management from Spring Boot -->
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>2.0.0.RELEASE</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+  <modules>
+    <module>prh-app-server</module>
+    <module>prh-aai-client</module>
+    <module>prh-dmaap-client</module>
+  </modules>
 </project>
 
diff --git a/prh-aai-client/pom.xml b/prh-aai-client/pom.xml
new file mode 100644
index 00000000..5ac67ce8
--- /dev/null
+++ b/prh-aai-client/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+
+  <parent>
+    <artifactId>prh</artifactId>
+    <groupId>org.onap.dcaegen2.services</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>prh-aai-client</artifactId>
+</project>
\ No newline at end of file
diff --git a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/publisher/config/aai/AAIDmaapProducerConfiguration.java b/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java
index 214ffa94..396a78be 100644
--- a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/publisher/config/aai/AAIDmaapProducerConfiguration.java
+++ b/prh-aai-client/src/main/java/services/config/AAIDmaapProducerConfiguration.java
@@ -17,15 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcaegen2.services.prh.event.executor.publisher.config.aai;
+package services.config;
 
 import java.net.URL;
 import org.immutables.value.Value;
-import org.onap.dcaegen2.services.prh.event.executor.mutual.config.DmaapConfig;
 
 /**
- * @author Przemysław Wąsala <przemyslaw.wasala@nokia.com> on 3/23/18
- * @project pnf-registration-handler
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
  */
 @Value.Immutable(prehash = true)
 @Value.Style(stagedBuilder = true)
diff --git a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/Config.java b/prh-aai-client/src/main/java/services/config/Config.java
index d0784457..a2a012c5 100644
--- a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/Config.java
+++ b/prh-aai-client/src/main/java/services/config/Config.java
@@ -17,13 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcaegen2.services.prh.event.executor.mutual.config;
+package services.config;
 
 import java.io.Serializable;
 
 /**
- * @author Przemysław Wąsala <przemyslaw.wasala@nokia.com> on 3/23/18
- * @project pnf-registration-handler
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
  */
 interface Config extends Serializable {
 
diff --git a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/DmaapConfig.java b/prh-aai-client/src/main/java/services/config/DmaapConfig.java
index 0a2ee9d1..0ddaea28 100644
--- a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/DmaapConfig.java
+++ b/prh-aai-client/src/main/java/services/config/DmaapConfig.java
@@ -17,11 +17,10 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcaegen2.services.prh.event.executor.mutual.config;
+package services.config;
 
 /**
- * @author Przemysław Wąsala <przemyslaw.wasala@nokia.com> on 3/23/18
- * @project pnf-registration-handler
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
  */
 public abstract class DmaapConfig implements Config {
 
diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml
new file mode 100644
index 00000000..513b5118
--- /dev/null
+++ b/prh-app-server/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>prh</artifactId>
+    <groupId>org.onap.dcaegen2.services</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>prh-app-server</artifactId>
+  <packaging>jar</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <!--Development tools dependencies-->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webflux</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-commons</artifactId>
+      <version>RELEASE</version>
+    </dependency>
+    
+  </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <!-- Import dependency management from Spring Boot -->
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>2.0.0.RELEASE</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+</project>
\ No newline at end of file
diff --git a/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java
index ca7cc362..ebdf1bb4 100644
--- a/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java
@@ -26,8 +26,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
- * @author Przemysław Wąsala <przemyslaw.wasala@nokia.com> on 3/23/18
- * @project pnf-registration-handler
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
  */
 @SpringBootApplication
 @Configuration
diff --git a/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java
index 61b0c69b..22dd24bd 100644
--- a/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/exceptions/AAINotFoundException.java
@@ -20,8 +20,7 @@
 package org.onap.dcaegen2.services.prh.exceptions;
 
 /**
- * @author Przemysław Wąsala <przemyslaw.wasala@nokia.com> on 3/23/18
- * @project pnf-registration-handler
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
  */
 public class AAINotFoundException extends Exception {
 
diff --git a/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java
index 5902587b..0d7ec225 100644
--- a/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java
@@ -26,8 +26,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 /**
- * @author Przemysław Wąsala <przemyslaw.wasala@nokia.com> on 3/23/18
- * @project pnf-registration-handler
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
  */
 @Component
 public class DmaapConsumerTask implements DmaapTask {
diff --git a/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java
index bb3fdc6d..f5f8c284 100644
--- a/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapTask.java
@@ -22,8 +22,7 @@ package org.onap.dcaegen2.services.prh.tasks;
 import org.onap.dcaegen2.services.prh.exceptions.AAINotFoundException;
 
 /**
- * @author Przemysław Wąsala <przemyslaw.wasala@nokia.com> on 3/23/18
- * @project pnf-registration-handler
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
  */
 public interface DmaapTask {
 
diff --git a/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
index c06eceb0..006d44ea 100644
--- a/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
@@ -29,8 +29,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 /**
- * @author Przemysław Wąsala <przemyslaw.wasala@nokia.com> on 3/23/18
- * @project pnf-registration-handler
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
  */
 @Component
 public class ScheduledTask {
diff --git a/prh-app-server/src/main/resources/application.yaml b/prh-app-server/src/main/resources/application.yaml
new file mode 100644
index 00000000..4d372c26
--- /dev/null
+++ b/prh-app-server/src/main/resources/application.yaml
@@ -0,0 +1,2 @@
+server:
+  port: 8100
\ No newline at end of file
diff --git a/src/test/java/org/onap/dcaegen2/services/prh/ServerPrhAppTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/ServerPrhAppTest.java
index 4373a50d..4373a50d 100644
--- a/src/test/java/org/onap/dcaegen2/services/prh/ServerPrhAppTest.java
+++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/ServerPrhAppTest.java
diff --git a/prh-app-server/src/test/resources/logback-test.xml b/prh-app-server/src/test/resources/logback-test.xml
new file mode 100644
index 00000000..0a53315a
--- /dev/null
+++ b/prh-app-server/src/test/resources/logback-test.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ ===============================LICENSE_START======================================
+  ~    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  ~ ================================================================================
+  ~  Licensed under the Apache License, Version 2.0 (the "License");
+  ~  you may not use this file except in compliance with the License.
+  ~   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===========================================
+  -->
+<configuration debug="false">
+  <include resource="org/springframework/boot/logging/logback/base.xml"/>
+  <logger name="org.onap.dcaegen2.services.prh" level="DEBUG"/>
+  <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="ERROR">
+    <appender-ref ref="Console"/>
+  </root>
+
+
+</configuration>
diff --git a/prh-dmaap-client/pom.xml b/prh-dmaap-client/pom.xml
new file mode 100644
index 00000000..68170645
--- /dev/null
+++ b/prh-dmaap-client/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>prh</artifactId>
+    <groupId>org.onap.dcaegen2.services</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>prh-dmaap-client</artifactId>
+
+</project>
\ No newline at end of file
diff --git a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/AAIConfig.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/Config.java
index 58858b5c..422f3daf 100644
--- a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/mutual/config/AAIConfig.java
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/Config.java
@@ -17,12 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcaegen2.services.prh.event.executor.mutual.config;
+package org.onap.dcaegen2.services.config;
+
+import java.io.Serializable;
 
 /**
- * @author Przemysław Wąsala <przemyslaw.wasala@nokia.com> on 3/23/18
- * @project pnf-registration-handler
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
  */
-public abstract class AAIConfig implements Config {
+interface Config extends Serializable {
 
 }
diff --git a/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java
new file mode 100644
index 00000000..3b485cdb
--- /dev/null
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConfig.java
@@ -0,0 +1,34 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2018 NOKIA 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=========================================================
+ */
+package org.onap.dcaegen2.services.config;
+
+/**
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
+ */
+public abstract class DmaapConfig implements Config {
+
+    private String dmmaphostName;
+    private Integer dmmapportNumber;
+    private String dmmaptopicName;
+    private String dmmapprotocol;
+    private String dmmapuserName;
+    private String dmmapuserPassword;
+    private String dmmapcontentType;
+}
diff --git a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/consumer/config/dmaap/DmaapConsumerConfiguration.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java
index 3ea3d213..d36104bd 100644
--- a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/consumer/config/dmaap/DmaapConsumerConfiguration.java
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapConsumerConfiguration.java
@@ -17,14 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcaegen2.services.prh.event.executor.consumer.config.dmaap;
+package org.onap.dcaegen2.services.config;
 
 import org.immutables.value.Value;
-import org.onap.dcaegen2.services.prh.event.executor.mutual.config.DmaapConfig;
 
 /**
- * @author Przemysław Wąsala <przemyslaw.wasala@nokia.com> on 3/23/18
- * @project pnf-registration-handler
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
  */
 @Value.Immutable(prehash = true)
 @Value.Style(stagedBuilder = true)
@@ -36,4 +34,4 @@ public abstract class DmaapConsumerConfiguration extends DmaapConfig {
     private String consumerGroup;
     private Integer timeoutMS;
     private Integer messageLimit;
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/publisher/config/dmaap/DmaapProducerConfiguration.java b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapProducerConfiguration.java
index 494fad4c..f5749a3f 100644
--- a/src/main/java/org/onap/dcaegen2/services/prh/event/executor/publisher/config/dmaap/DmaapProducerConfiguration.java
+++ b/prh-dmaap-client/src/main/java/org/onap/dcaegen2/services/config/DmaapProducerConfiguration.java
@@ -17,15 +17,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcaegen2.services.prh.event.executor.publisher.config.dmaap;
-
-import org.onap.dcaegen2.services.prh.event.executor.mutual.config.DmaapConfig;
+package org.onap.dcaegen2.services.config;
 
 /**
- * @author Przemysław Wąsala <przemyslaw.wasala@nokia.com> on 3/23/18
- * @project pnf-registration-handler
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18
  */
-
 public class DmaapProducerConfiguration extends DmaapConfig {
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
deleted file mode 100644
index ef147c10..00000000
--- a/src/main/resources/application.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-server:
-    port: 8080
-logging:
-  level:
-    .:  error
-    org.springframework: ERROR
-    org.onap.dcaegen2.services.prg: ERROR
\ No newline at end of file