From 7143ac416a61ff865c86001d0357259748b48b85 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Wed, 27 Feb 2019 10:11:44 -0500 Subject: Fix start up corrected application properties Issue-ID: SO-1558 Change-Id: Ib768d7c72a64a11dbb08eea79c4c9a4f5fb970a6 Signed-off-by: Benjamin, Max (mb388a) --- adapters/mso-catalog-db-adapter/pom.xml | 4 --- .../src/main/resources/application-local.yaml | 14 +---------- .../src/main/resources/application.yaml | 2 +- adapters/mso-openstack-adapters/pom.xml | 11 -------- .../src/main/resources/application-local.yaml | 29 ++++++++-------------- .../src/main/resources/application.yaml | 2 +- .../src/test/resources/application-test.yaml | 2 +- 7 files changed, 14 insertions(+), 50 deletions(-) (limited to 'adapters') diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml index dbfc5b7f6b..390c775cb2 100644 --- a/adapters/mso-catalog-db-adapter/pom.xml +++ b/adapters/mso-catalog-db-adapter/pom.xml @@ -151,10 +151,6 @@ - - org.springframework.boot - spring-boot-starter-jdbc - org.springframework.boot spring-boot-starter-test diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/application-local.yaml b/adapters/mso-catalog-db-adapter/src/main/resources/application-local.yaml index 078e22b8ee..d7c13eaa14 100644 --- a/adapters/mso-catalog-db-adapter/src/main/resources/application-local.yaml +++ b/adapters/mso-catalog-db-adapter/src/main/resources/application-local.yaml @@ -13,15 +13,7 @@ mso: endpoint: http://localhost:8090 db: auth: Basic YnBlbDptc28tZGItMTUwNyE= - spring: - datasource: - jdbc-url: jdbc:mariadb://localhost:3306/catalogdb - username: catalog - password: catalog123 - driver-class-name: org.mariadb.jdbc.Driver - initialization-mode: never - security: usercredentials: - @@ -40,8 +32,4 @@ spring: server: port: 8090 -flyway: - baseline-on-migrate: false - jdbc-url: jdbc:mariadb://localhost:3306/catalogdb - user: catalog - password: catalog123 + diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml index 0977bf95fb..aa9317c920 100644 --- a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml +++ b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml @@ -16,7 +16,7 @@ mso: spring: datasource: - jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb + url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb username: ${DB_USERNAME} password: ${DB_PASSWORD} driver-class-name: org.mariadb.jdbc.Driver diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml index 12aee67a74..f2ee07317c 100644 --- a/adapters/mso-openstack-adapters/pom.xml +++ b/adapters/mso-openstack-adapters/pom.xml @@ -180,16 +180,6 @@ org.springframework.boot spring-boot-starter-data-jpa - - - org.apache.tomcat - tomcat-jdbc - - - - - org.springframework.boot - spring-boot-starter-jdbc org.apache.cxf @@ -211,7 +201,6 @@ swagger-ui 3.5.0 - org.springframework.boot spring-boot-starter-test diff --git a/adapters/mso-openstack-adapters/src/main/resources/application-local.yaml b/adapters/mso-openstack-adapters/src/main/resources/application-local.yaml index 771aa80081..936bde125a 100644 --- a/adapters/mso-openstack-adapters/src/main/resources/application-local.yaml +++ b/adapters/mso-openstack-adapters/src/main/resources/application-local.yaml @@ -49,7 +49,16 @@ ssl-enable: false tomcat: max-threads: 50 mso: + msoKey: 07a7159d3bf51a0e53be7a8f89699be7 + auth: 6B466C603A260F3655DBF91E53CE54667041C01406D10E8CAF9CC24D8FA5388D06F90BFE4C852052B436 logPath: logs + workflow: + endpoint: http://bpmn-infra:8081/sobpmnengine + topics: + retryMultiplier: 1000 + config: + cadi: + aafId: test catalog: db: spring: @@ -61,26 +70,8 @@ mso: core-pool-size: 50 max-pool-size: 50 queue-capacity: 500 -# 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 - jpa: - show-sql: true - hibernate: - dialect: org.hibernate.dialect.MySQL5Dialect - ddl-auto: validate - naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy - enable_lazy_load_no_trans: true +spring: security: usercredentials: - diff --git a/adapters/mso-openstack-adapters/src/main/resources/application.yaml b/adapters/mso-openstack-adapters/src/main/resources/application.yaml index a68372f833..4e8d389998 100644 --- a/adapters/mso-openstack-adapters/src/main/resources/application.yaml +++ b/adapters/mso-openstack-adapters/src/main/resources/application.yaml @@ -18,7 +18,7 @@ mso: retryMultiplier: 60000 spring: datasource: - jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb + url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb username: ${DB_USERNAME} password: ${DB_PASSWORD} driver-class-name: org.mariadb.jdbc.Driver diff --git a/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml b/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml index 051884d60d..398885cd08 100644 --- a/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml +++ b/adapters/mso-openstack-adapters/src/test/resources/application-test.yaml @@ -77,7 +77,7 @@ mso: queue-capacity: 500 spring: datasource: - jdbcUrl: jdbc:mariadb://localhost:3307/catalogdb + url: jdbc:mariadb://localhost:3307/catalogdb username: root password: password driver-class-name: org.mariadb.jdbc.Driver -- cgit 1.2.3-korg