summaryrefslogtreecommitdiffstats
path: root/bpmn/mso-infrastructure-bpmn
diff options
context:
space:
mode:
authorBenjamin, Max (mb388a) <mb388a@us.att.com>2019-02-27 10:11:44 -0500
committerBenjamin, Max (mb388a) <mb388a@us.att.com>2019-02-27 10:12:36 -0500
commit7143ac416a61ff865c86001d0357259748b48b85 (patch)
tree40f3fda6f23f761fe94150dc45784dedf7dc4023 /bpmn/mso-infrastructure-bpmn
parenta96380d2d7ccc93e808ab0c7f4a047095878e254 (diff)
Fix start up
corrected application properties Issue-ID: SO-1558 Change-Id: Ib768d7c72a64a11dbb08eea79c4c9a4f5fb970a6 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Diffstat (limited to 'bpmn/mso-infrastructure-bpmn')
-rw-r--r--bpmn/mso-infrastructure-bpmn/src/main/resources/application-local.yml41
-rw-r--r--bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml2
-rw-r--r--bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml2
3 files changed, 8 insertions, 37 deletions
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/resources/application-local.yml b/bpmn/mso-infrastructure-bpmn/src/main/resources/application-local.yml
index ccea9483a8..d7effb093f 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/resources/application-local.yml
+++ b/bpmn/mso-infrastructure-bpmn/src/main/resources/application-local.yml
@@ -14,8 +14,6 @@ camunda:
job-execution:
max-pool-size: 30
core-pool-size: 3
-entitymanager:
- packagesToScan: com
pnf:
dmaap:
host: message-router
@@ -34,7 +32,10 @@ mso:
core-pool-size: 50
max-pool-size: 50
queue-capacity: 500
- adapters:
+ adapters:
+ requestDb:
+ endpoint: http://request-db-adapter:8083
+ auth: Basic bTA0NzY4QG5vbi1wcm9kLm1zby5lY29tcC5hdHQuY29tOkF0dG0wNDc2OExpZmUhQA==
completemsoprocess:
endpoint: http://localhost:30253/CompleteMsoProcess
db:
@@ -224,20 +225,8 @@ appc:
secret: lgjXraD1HutKxv8jEN6tVouu
service: ueb
poolMembers: localhost:3904
-server:
- port: 8080
- tomcat:
- max-threads: 50
-spring:
- h2:
- console:
- enabled: true
- path: /h2
- datasource:
- url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
- username: sa
- password: sa
- driverClassName: org.h2.Driver
+
+spring:
security:
usercredentials:
-
@@ -264,23 +253,5 @@ spring:
username: mso_admin
password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa'
role: ACTUATOR
-request:
- datasource:
- url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
- username: sa
- password: sa
- driver-class-name: org.h2.Driver
- intialize: true
-
-# Hibernate
-hibernate:
- dialect: org.hibernate.dialect.MySQL5Dialect
- show_sql: true
- hbm2ddl:
- auto: create
-
-#Actuator
-management:
- context-path: /manage
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
index 18b94e725a..a91cb9d88d 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
+++ b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
@@ -8,7 +8,7 @@ mso:
spring:
datasource:
driver-class-name: org.mariadb.jdbc.Driver
- jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn
+ url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/camundabpmn
username: ${DB_ADMIN_USERNAME}
password: ${DB_ADMIN_PASSWORD}
http:
diff --git a/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml b/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml
index 21ad485fdb..56a92cbd01 100644
--- a/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml
+++ b/bpmn/mso-infrastructure-bpmn/src/test/resources/application-test.yaml
@@ -157,7 +157,7 @@ sniro:
headers.latestVersion: 2
spring:
datasource:
- jdbcUrl: jdbc:mariadb://localhost:3307/camundabpmn
+ url: jdbc:mariadb://localhost:3307/camundabpmn
username: root
password: password
driver-class-name: org.mariadb.jdbc.Driver