diff options
author | Smokowski, Steve (ss835w) <ss835w@us.att.com> | 2018-08-03 14:34:07 -0400 |
---|---|---|
committer | Rob Daugherty <rd472p@att.com> | 2018-08-03 22:52:00 +0000 |
commit | 74fe8ef18daf5fa716f1d1cb3c4b7975b0399b44 (patch) | |
tree | 056779c5e679eb982b183a8603f12fcc2d936933 /adapters/mso-vfc-adapter/src/main/resources | |
parent | bfa284c2edb24d9e6fea3cf7921a4f78cd4c02ad (diff) |
Fix Junit
Junit was using an illegal http error code
Issue-ID: SO-793
Change-Id: Ica36a5e22f32680710da649eb0dbfe5cac93b93c
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
Diffstat (limited to 'adapters/mso-vfc-adapter/src/main/resources')
-rw-r--r-- | adapters/mso-vfc-adapter/src/main/resources/application-local.yaml | 34 | ||||
-rw-r--r-- | adapters/mso-vfc-adapter/src/main/resources/application.yaml | 53 |
2 files changed, 58 insertions, 29 deletions
diff --git a/adapters/mso-vfc-adapter/src/main/resources/application-local.yaml b/adapters/mso-vfc-adapter/src/main/resources/application-local.yaml new file mode 100644 index 0000000000..0519f50c46 --- /dev/null +++ b/adapters/mso-vfc-adapter/src/main/resources/application-local.yaml @@ -0,0 +1,34 @@ +server: + port: 8091 + tomcat: + max-threads: 50 +ssl-enable: false +mso: + logPath: logs + site-name: localSite +spring: + datasource: + url: jdbc:mariadb://localhost:3306/requestdb + username: mso + password: mso123 + driver-class-name: org.mariadb.jdbc.Driver + initialize: true + initialization-mode: never + jpa: + generate-ddl: false + show-sql: false + hibernate: + ddl-auto: validate + naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy + enable-lazy-load-no-trans: true + database-platform: org.hibernate.dialect.MySQL5InnoDBDialect + security: + usercredentials: + - + username: bpel + password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO' + role: BPEL-Client + - + username: mso_admin + password: '$2a$12$tidKuu.h88E2nuL95pTVY.ZOYMN/1dp29A9b1o.0GFDsVVSYlMkHa' + role: ACTUATOR diff --git a/adapters/mso-vfc-adapter/src/main/resources/application.yaml b/adapters/mso-vfc-adapter/src/main/resources/application.yaml index ba574ba3e9..2cee9cf7dc 100644 --- a/adapters/mso-vfc-adapter/src/main/resources/application.yaml +++ b/adapters/mso-vfc-adapter/src/main/resources/application.yaml @@ -1,37 +1,32 @@ -logging: - path: logs - -# H2 -spring: - datasource: - url: jdbc:h2:mem:test;DB_CLOSE_DELAY=-1; - username: sa - password: sa - driver-class-name: org.h2.Driver - intialize: true - h2: - console: - enabled: true - path: /h2 server: port: 8080 tomcat: max-threads: 50 -mso: - site-name: localSite -#Actuator -management: - security: - enabled: false - basic: - enabled: false - metrics: - se-global-registry: false - export: - prometheus: - enabled: true # Whether exporting of metrics to Prometheus is enabled. - step: 1m # Step size (i.e. reporting frequency) to use. +mso: + site-name: unknown + logPath: ./logs/vfc/ +spring: + datasource: + url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + driver-class-name: org.mariadb.jdbc.Driver + dbcp2: + initial-size: 5 + max-total: 20 + validation-query: select 1 + test-on-borrow: true + jpa: + show-sql: false + hibernate: + dialect: org.hibernate.dialect.MySQL5Dialect + ddl-auto: validate + naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy + enable-lazy-load-no-trans: true +#Actuator +management: + context-path: /manage |