Maven resources refactoring

Added resurces to java spring classpath directly

Change-Id: I194748706f63cff1966111bbdb52538bd5a83855
Issue-ID: DCAEGEN2-606
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>

7 files changed, 66 insertions, 33 deletions

diff --git a/prh-app-server/src/main/resources/application.properties b/prh-app-server/src/main/resources/application.properties
deleted file mode 100644
index e343a360..00000000
--- a/prh-app-server/src/main/resources/application.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-spring.profiles.active=prod
-server.port=8433
-server.ssl.key-store-type=PKCS12
-server.ssl.key-store-password=nokiapnf
-server.ssl.key-store=classpath:keystore.jks
-server.ssl.key-password=nokiapnf
-server.ssl.key-alias=tomcat-localhost
-logging.level.root=ERROR
-logging.level.org.springframework=ERROR
-logging.level.org.springframework.data=ERROR
-logging.level.org.onap.dcaegen2.services.prh=INFO
-logging.level.org.springframework.web.reactive=WARN
-logging.level.reactor.ipc.netty.http.client=WARN
-app.filepath=config/prh_endpoints.json
-app.xonaprequestid=requestID
-app.xinvocationid=invocationID
-
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..88d1e401
--- /dev/null
+++ b/prh-app-server/src/main/resources/application.yaml
@@ -0,0 +1,19 @@
+spring:
+  profiles:
+    active: prod
+server:
+  port: 8433
+  ssl:
+    key-store-type: PKCS12
+    key-store-password: nokiapnf
+    key-store: classpath:keystore-local
+    key-password: nokiapnf
+    keyAlias: tomcat-localhost
+logging:
+  level:
+    ROOT: ERROR
+    org.onap.dcaegen2.services.prh: INFO
+    reactor.ipc.netty.http.client: WARN
+    org.springframework: ERROR
+    org.springframework.data: ERROR
+    org.springframework.web.reactive: WARN
diff --git a/prh-app-server/src/main/resources/keystore.jks b/prh-app-server/src/main/resources/keystore-local
index cd27cc01..cd27cc01 100644
--- a/prh-app-server/src/main/resources/keystore.jks
+++ b/prh-app-server/src/main/resources/keystore-local
diff --git a/prh-app-server/src/main/resources/keystore-onap b/prh-app-server/src/main/resources/keystore-onap
new file mode 100644
index 00000000..26a16f75
--- /dev/null
+++ b/prh-app-server/src/main/resources/keystore-onap
diff --git a/prh-app-server/src/main/resources/keystore.jks.old b/prh-app-server/src/main/resources/keystore.jks.old
deleted file mode 100644
index 8a2b4f99..00000000
--- a/prh-app-server/src/main/resources/keystore.jks.old
+++ /dev/null
diff --git a/prh-app-server/src/main/resources/prh_endpoints.json b/prh-app-server/src/main/resources/prh_endpoints.json
new file mode 100644
index 00000000..b3bff7d9
--- /dev/null
+++ b/prh-app-server/src/main/resources/prh_endpoints.json
@@ -0,0 +1,47 @@
+{
+  "configs": {
+    "dmaap": {
+      "dmaapConsumerConfiguration": {
+        "dmaapHostName": "localhost",
+        "dmaapPortNumber": 2222,
+        "dmaapTopicName": "/events/unauthenticated.VES_PNFREG_OUTPUT",
+        "dmaapProtocol": "http",
+        "dmaapUserName": "admin",
+        "dmaapUserPassword": "admin",
+        "dmaapContentType": "application/json",
+        "consumerId": "c12",
+        "consumerGroup": "OpenDcae-c12",
+        "timeoutMs": -1,
+        "messageLimit": 1
+      },
+      "dmaapProducerConfiguration": {
+        "dmaapHostName": "localhost",
+        "dmaapPortNumber": 2223,
+        "dmaapTopicName": "/events/unauthenticated.PNF_READY",
+        "dmaapProtocol": "http",
+        "dmaapUserName": "admin",
+        "dmaapUserPassword": "admin",
+        "dmaapContentType": "application/json"
+      }
+    },
+    "aai": {
+      "aaiClientConfiguration": {
+        "aaiHost": "localhost",
+        "aaiPort": 8080,
+        "aaiProtocol": "https",
+        "aaiUserName": "AAI",
+        "aaiUserPassword": "AAI",
+        "aaiIgnoreSslCertificateErrors": true,
+        "aaiBasePath": "/aai/v12",
+        "aaiPnfPath": "/network/pnfs/pnf",
+        "aaiHeaders": {
+          "X-FromAppId": "prh",
+          "X-TransactionId": "9999",
+          "Accept": "application/json",
+          "Real-Time": "true",
+          "Content-Type": "application/merge-patch+json"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/prh-app-server/src/main/resources/scheduled-context.xml b/prh-app-server/src/main/resources/scheduled-context.xml
deleted file mode 100644
index 82067c17..00000000
--- a/prh-app-server/src/main/resources/scheduled-context.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:context="http://www.springframework.org/schema/context"
-  xmlns:task="http://www.springframework.org/schema/task"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://www.springframework.org/schema/beans"
-  xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd">
-
-  <context:component-scan
-    base-package="org.onap.dcaegen2.services.prh"/>
-  <task:scheduled-tasks>
-    <task:scheduled fixed-rate="1000" method="startTasks"
-      ref="scheduleController"/>
-  </task:scheduled-tasks>
-</beans>