DP: Project Structure and basic conf

Issue-ID: CCSDK-2749

https: //jira.onap.org/browse/CCSDK-2749

Signed-off-by: Rishi Chail <rishi.chail@est.tech>
Change-Id: Ib2139263be435414855e2f487e96c2122f21c978
Signed-off-by: Rishi Chail <rishi.chail@est.tech>

diff --git a/cps/.gitignore b/cps/.gitignore
index ba64fc2..624c9b6 100644 (file)
--- a/cps/.gitignore
+++ b/cps/.gitignore
@@ -1,6 +1,8 @@
 *.class
 *.jar
 *.war
+*.zip
+*.log
 
 target/
 log/

diff --git a/cps/cps-rest/pom.xml b/cps/cps-rest/pom.xml
index 41b5c42..0e8317b 100644 (file)
--- a/cps/cps-rest/pom.xml
+++ b/cps/cps-rest/pom.xml
@@ -21,12 +21,6 @@
             <groupId>org.onap.cps</groupId>\r
             <artifactId>cps-ri</artifactId>\r
             <version>${project.version}</version>\r
-            <exclusions>\r
-                <exclusion>\r
-                    <groupId>org.springframework.boot</groupId>\r
-                    <artifactId>spring-boot-starter-data-jpa</artifactId>\r
-                </exclusion>\r
-            </exclusions>\r
         </dependency>\r
 \r
         <dependency>\r

diff --git a/cps/cps-rest/src/main/java/org/onap/cps/rest/Application.java b/cps/cps-rest/src/main/java/org/onap/cps/Application.java
similarity index 95%
rename from cps/cps-rest/src/main/java/org/onap/cps/rest/Application.java
rename to cps/cps-rest/src/main/java/org/onap/cps/Application.java
index 3183efc..9f6c2ed 100644 (file)
--- a/cps/cps-rest/src/main/java/org/onap/cps/rest/Application.java
+++ b/cps/cps-rest/src/main/java/org/onap/cps/Application.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================\r
  */\r
 \r
-package org.onap.cps.rest;\r
+package org.onap.cps;\r
 \r
 import org.springframework.boot.SpringApplication;\r
 import org.springframework.boot.autoconfigure.SpringBootApplication;\r

diff --git a/cps/cps-rest/src/main/resources/application.yml b/cps/cps-rest/src/main/resources/application.yml
index ab19fe9..bc72669 100644 (file)
--- a/cps/cps-rest/src/main/resources/application.yml
+++ b/cps/cps-rest/src/main/resources/application.yml
@@ -4,6 +4,15 @@ server:
 spring:\r
     main:\r
         banner-mode: "off"\r
+    # for POC only, later this should move to cpi-ri module\r
+    jpa:\r
+        hibernate:\r
+        ddl-auto: create\r
+    datasource:\r
+        url: jdbc:mariadb://${DB_HOST}:3306/${DB_NAME}\r
+        username: ${USERNAME}\r
+        password: ${PWD}\r
+        driverClassName: org.mariadb.jdbc.Driver\r
 \r
 logging:\r
     level:\r

diff --git a/cps/cps-rest/src/main/resources/logback-spring.xml b/cps/cps-rest/src/main/resources/logback-spring.xml
index fce0aca..8a4ae07 100644 (file)
--- a/cps/cps-rest/src/main/resources/logback-spring.xml
+++ b/cps/cps-rest/src/main/resources/logback-spring.xml
@@ -19,7 +19,7 @@
         <file>../log/${logName}.log</file>
         <rollingPolicy
             class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${debugLogName}.%d{yyyy-MM-dd}.%i.log.zip
+            <fileNamePattern>${logName}.%d{yyyy-MM-dd}.%i.log.zip
             </fileNamePattern>
             <maxFileSize>${maxFileSize}</maxFileSize>
             <maxHistory>${maxHistory}</maxHistory>

diff --git a/cps/cps-ri/pom.xml b/cps/cps-ri/pom.xml
index 3d0ccf0..0d6dcac 100644 (file)
--- a/cps/cps-ri/pom.xml
+++ b/cps/cps-ri/pom.xml
@@ -11,6 +11,13 @@
 \r
     <dependencies>\r
 \r
+        <dependency>\r
+            <groupId>org.onap.cps</groupId>\r
+            <artifactId>cps-service</artifactId>\r
+            <version>${project.version}</version>\r
+            <scope>compile</scope>\r
+        </dependency>\r
+\r
         <dependency>\r
             <groupId>org.springframework.boot</groupId>\r
             <artifactId>spring-boot-starter-data-jpa</artifactId>\r
@@ -21,6 +28,11 @@
             <artifactId>spring-boot-starter-validation</artifactId>\r
         </dependency>\r
 \r
+        <dependency>\r
+            <groupId>org.mariadb.jdbc</groupId>\r
+            <artifactId>mariadb-java-client</artifactId>\r
+        </dependency>\r
+\r
         <dependency>\r
             <groupId>org.projectlombok</groupId>\r
             <artifactId>lombok</artifactId>\r

diff --git a/cps/cps-ri/src/main/resources/application.yml b/cps/cps-ri/src/main/resources/application.yml
deleted file mode 100644 (file)
index fc68833..0000000
--- a/cps/cps-ri/src/main/resources/application.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:\r
-  jpa:\r
-    hibernate:\r
-      ddl-auto: create\r
-  datasource:\r
-    url: jdbc:mariadb://${DB_HOST}:3306/${DB_NAME}\r
-    username: ${USERNAME}\r
-    password: ${PWD}
\ No newline at end of file

diff --git a/cps/cps-ri/src/main/resources/logback-spring.xml b/cps/cps-ri/src/main/resources/logback-spring.xml
index fce0aca..8a4ae07 100644 (file)
--- a/cps/cps-ri/src/main/resources/logback-spring.xml
+++ b/cps/cps-ri/src/main/resources/logback-spring.xml
@@ -19,7 +19,7 @@
         <file>../log/${logName}.log</file>
         <rollingPolicy
             class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${debugLogName}.%d{yyyy-MM-dd}.%i.log.zip
+            <fileNamePattern>${logName}.%d{yyyy-MM-dd}.%i.log.zip
             </fileNamePattern>
             <maxFileSize>${maxFileSize}</maxFileSize>
             <maxHistory>${maxHistory}</maxHistory>

diff --git a/cps/cps-service/src/main/resources/logback-spring.xml b/cps/cps-service/src/main/resources/logback-spring.xml
index fce0aca..8a4ae07 100644 (file)
--- a/cps/cps-service/src/main/resources/logback-spring.xml
+++ b/cps/cps-service/src/main/resources/logback-spring.xml
@@ -19,7 +19,7 @@
         <file>../log/${logName}.log</file>
         <rollingPolicy
             class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${debugLogName}.%d{yyyy-MM-dd}.%i.log.zip
+            <fileNamePattern>${logName}.%d{yyyy-MM-dd}.%i.log.zip
             </fileNamePattern>
             <maxFileSize>${maxFileSize}</maxFileSize>
             <maxHistory>${maxHistory}</maxHistory>