Merge branch '2.0.x' into 2.0.x-updates

  + fix conflicts

Conflicts:
	crss-admin/crss-admin-pemc-top-sit.yml
	crss-audit/application-dev2.yml
	crss-dataflow-app/crss-dataflow-app-dev2.yml
	crss-dataflow-app/crss-dataflow-app-devlocal.yml
	crss-datainterface-task-ingest/crss-datainterface-task-ingest-pemc-uat-sit.yml
	crss-meterprocess-app/crss-meterprocess-app-dev2.yml
	crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-dev2.yml
	crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-dev2.yml
	crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-dev2.yml
	crss-mq-computation/crss-mq-computation-dev2.yml
	crss-mtr/crss-mtr-dev2.yml
	crss-settlement-task-calculation-addtlcomp/application-dev2.yml
	crss-settlement-task-calculation-addtlcomp/application-devlocal.yml
	crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-dev.yml
	crss-settlement-task-calculation/crss-settlement-task-calculation-dev2.yml
	crss-settlement-task-calculation/crss-settlement-task-calculation-devlocal.yml
	crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-uat-default.yml
	crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-uat-sit.yml
	crss-settlement-task-calculation/crss-settlement-task-calculation.yml
	crss-settlement-task-validation/crss-settlement-task-validation-dev.yml

crss-audit/crss-audit-dev2.yml

@@ -5,6 +5,32 @@ spring:
       username: crss_audit
       password: crss_audit
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 2
+      connectionTimeout: 10000
+      test-on-borrow: true
+      validation-query: SELECT 1
+  jpa:
+    open-in-view: false
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        ddl-auto: none
+        hbm2ddl:
+          auto: none
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+server:
+  port: 9094
+  undertow:
+    accesslog:
+      dir: target
+      enabled: true
+      pattern: combined
+    compression:
+      enabled: true
+      min-response-size: 1
 
 security:
   oauth2:
@@ -13,3 +39,7 @@ security:
       userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
     resource:
       userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
+
+logging:
+  level:
+    com.pemc: debug

crss-dataflow-app/crss-dataflow-app-dev2.yml

@@ -5,7 +5,75 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 2
+      connectionTimeout: 10000
+      test-on-borrow: true
+      validation-query: SELECT 1
+  jpa:
+    show-sql: true
+    generate-ddl: false
+    properties:
+      hibernate:
+        generate_statistics: true
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        ddl-auto: none
+        hbm2ddl:
+          import_files:
+
+  # prevent batch job from running on app start
+  batch:
+    job:
+      enabled: false
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+#liquibase:
+#  change-log: classpath:/db/db.changelog-master.xml
+
+server:
+  port: 8082
+  undertow:
+    accesslog:
+      dir: target
+      enabled: true
+      pattern: combined
+  compression:
+    enabled: true
+    min-response-size: 1
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
+
 
 logging:
   level:
-    org.hibernate.type: trace
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.apache.http: DEBUG
+    org.hibernate.type: trace
+    org.hibernate.stat: debug
+
+dataflow:
+  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: pemc-storage.southeastasia.cloudapp.azure.com
+    port: 22
+    workingDirectory: /home/pemc/upload
+    privateKey:
+
+# temporary todi-config, to be moved to general config
+todi-config:
+  dispatch-interval: 5
+

crss-dataflow-app/crss-dataflow-app-devlocal.yml

@@ -0,0 +1,84 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 20
+      connectionTimeout: 10000
+      test-on-borrow: true
+      validation-query: SELECT 1
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        ddl-auto: update
+        hbm2ddl:
+          import_files:
+
+  # prevent batch job from running on app start
+  batch:
+    job:
+      enabled: false
+
+  redis:
+    host: localhost
+    port: 6379
+
+#liquibase:
+#  change-log: classpath:/db/db.changelog-master.xml
+
+server:
+  port: 9092
+  undertow:
+    accesslog:
+      dir: target
+      enabled: true
+      pattern: combined
+  compression:
+    enabled: true
+    min-response-size: 1
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://localhost:8082/oauth/access_token
+      userAuthorizationUri: http://localhost:8082/oauth/authorize
+      clientId: crss
+      clientSecret: crsssecret
+      authorized-grant-types: authorization_code,refresh_token,password
+      scope: openid
+      access-token-validity-seconds: 3600
+    resource:
+      userInfoUri: http://localhost:8082/user
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.apache.http: DEBUG
+
+dataflow:
+  url: http://localhost:9393
+
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: pemc-storage.southeastasia.cloudapp.azure.com
+    port: 22
+    workingDirectory: /home/pemc/upload
+    privateKey:
+
+# temporary todi-config, to be moved to general config
+todi-config:
+  dispatch-interval: 5
+  max-retry: 2
+
+crss:
+  api.gateway: http://localhost:8080

crss-datainterface-task-ingest/crss-datainterface-task-ingest-pemc-uat-sit.yml

@@ -4,24 +4,94 @@ spring:
       jdbcUrl: jdbc:oracle:thin:@10.176.23.24:1521:ORCL
       username: emdb
       password: emdb
+      driverClassName: oracle.jdbc.OracleDriver
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema?nmms
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 2
+      test-on-borrow: true
+      validation-query: SELECT 1
+  jpa:
+    show-sql: true
+    generate-ddl: true
+    properties:
+      hibernate:
+        #generate_statistics: true
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        ddl-auto: none
+        hbm2ddl:
+          auto: none
+  cloud:
+    task:
+      initialize:
+        enable: false
+  batch:
+    initializer:
+      enabled: false
 
   redis:
     database: 4
+
+logging:
+  level:
+    com.pemc: debug
+    org.hibernate.stat: debug
+
+batch:
+  resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
+  partitionSize:
+    mq: 1500
+    ssla: 1500
+    report: 1500
+    importPrices: 100
+  autoMinusDaysAgo: 2
+
+mqreport:
+  directory: /tmp/
+
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: 10.176.24.25
+    port: 2222
+    workingDirectory: /upload/rbcq
+    privateKey:
+
+database:
+  emdb:
+    rtu-db: "TEMP_SNAPSHOT_DATA"
+    energy-price-sched-db: "TEMP_MOAR_MVIEW"
+    reserve-price-sched-db: "TEMP_RESERVED_MOAR_MVIEW"
+  nmms:
+    rtu-db: "TXN_RTU"
+    energy-price-sched-db: "TXN_ENERGY_PRICE_SCHED"
+    reserve-price-sched-db: "TXN_RESERVE_PRICE_SCHED"
+    reserve-bcq-db: "TXN_RESERVE_BCQ"
+
+bcq:
+  fileNamePrefix: "reserve_bcq_"
+
+todi_config:
+  dispatch-interval: 5
+
+reserve-categories-white-list: "Regulation Down,Fast Contingency Raise,Fast Contingency Lower,Slow Contingency Raise,Slow Contingency Lower,Delayed Contingency Raise,Delayed Contingency Lower,Regulation Up"

crss-meterprocess-app/crss-meterprocess-app-dev2.yml

@@ -5,15 +5,84 @@ spring:
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: true
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        ddl-auto: none
+        hbm2ddl:
+          import_files:
+
+  # prevent batch job from running on app start
+  batch:
+    job:
+      enabled: false
+
+#liquibase:
+#  change-log: classpath:/db/db.changelog-master.xml
+
+server:
+  port: 8081
+  undertow:
+    accesslog:
+      dir: target
+      enabled: true
+      pattern: combined
+  compression:
+    enabled: true
+    min-response-size: 1
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug
+
+dataflow:
+  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+
+job:
+  maxRun: 1
+
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: sftp.marathon.l4lb.thisdcos.directory
+    port: 22
+    workingDirectory: /upload
+    privateKey:

crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-dev2.yml

@@ -1,13 +1,43 @@
 spring:
+  cloud:
+    stream:
+      bindings:
+        output:
+          content-type: application/json
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+
+  jpa:
+      show-sql: false
+      hibernate:
+        ddl-auto: none
+      properties:
+        hibernate:
+          dialect: org.hibernate.dialect.PostgreSQLDialect
+          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
+          hbm2ddl:
+            auto: none
+          temp:
+            use_jdbc_metadata_defaults: false
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+logging:
+  level:
+    com.pemc: debug

crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-dev2.yml

@@ -5,15 +5,48 @@ spring:
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
       username: crss_metering
       password: crss_metering
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+
+  jpa:
+    show-sql: false
+    hibernate:
+      ddl-auto: none
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
+        hbm2ddl:
+          auto: none
+        temp:
+          use_jdbc_metadata_defaults: false
+        default_schema: public
+
+  cloud:
+    stream:
+      bindings:
+        output:
+          content-type: application/json
+
+logging:
+  level:
+    com.pemc: debug

crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-dev2.yml

@@ -6,10 +6,25 @@ spring:
     username: crss_metering
     password: crss_metering
     driver-class-name: org.postgresql.Driver
-
+    maxPoolSize: 5
+    test-on-borrow: true
+    validation-query: SELECT 1
+  cloud:
+    stream:
+      bindings:
+        output:
+          content-type: application/json
 jdbc:
-  query: "select * from txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
+  query: "select * from metering.txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
+  update: "update metering.txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
+
+trigger:
+  fixed-delay: 5
+  time-unit: SECONDS
+
+logging:
+  level:
+    com.pemc: DEBUG
 
 ---
 
@@ -21,11 +36,25 @@ spring:
     username: crss_metering
     password: crss_metering
     driver-class-name: org.postgresql.Driver
-
+    maxPoolSize: 5
+    test-on-borrow: true
+    validation-query: SELECT 1
+  cloud:
+    stream:
+      bindings:
+        output:
+          content-type: application/json
 jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
+  query: "select * from metering.txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
+  update: "update metering.txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
+
+trigger:
+  fixed-delay: 5
+  time-unit: SECONDS
 
+logging:
+  level:
+    com.pemc: DEBUG
 
 ---
 
@@ -36,9 +65,22 @@ spring:
     username: crss_metering
     password: crss_metering
     driver-class-name: org.postgresql.Driver
-
+    maxPoolSize: 5
+    test-on-borrow: true
+    validation-query: SELECT 1
+  cloud:
+    stream:
+      bindings:
+        output:
+          content-type: application/json
 jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
+  query: "select * from metering.txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
+  update: "update metering.txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
 
+trigger:
+  fixed-delay: 5
+  time-unit: SECONDS
 
+logging:
+  level:
+    com.pemc: DEBUG

crss-mq-computation/crss-mq-computation-dev2.yml

@@ -5,19 +5,38 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration
       driverClassName: org.postgresql.Driver
-
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+  jpa:
+    # show-sql: true
+    generate-ddl: true
+    open-in-view: false
+    properties:
+      hibernate:
+        # generate_statistics: true
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        ddl-auto: none
+        hbm2ddl:
+          auto: none
   profiles:
     include: mesos
 
@@ -27,10 +46,44 @@ spring:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 1024
+    task:
+      initialize:
+        enable: false
+  batch:
+    initializer:
+      enabled: false
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+  cache:
+    jcache:
+      config: ehcache3.xml
+
+logging:
+  level:
+    com.pemc: debug
+    # org.hibernate.stat: debug
 
 batch:
+  # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
+  chunkSize: 100
+  maxWorkers: 10
   partitionSize:
+    gap: 5000
     mq: 10000
     ssla: 5000
     report: 1
 
+mqreport:
+  directory: /tmp/
+
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: sftp.marathon.l4lb.thisdcos.directory
+    port: 22
+    workingDirectory: /upload/mq
+    privateKey:

crss-mtr/crss-mtr-dev2.yml

@@ -5,19 +5,38 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration
       driverClassName: org.postgresql.Driver
-
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+  jpa:
+    show-sql: true
+    generate-ddl: true
+    open-in-view: false
+    properties:
+      hibernate:
+        generate_statistics: true
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        ddl-auto: none
+        hbm2ddl:
+          auto: none
   profiles:
     include: mesos
 
@@ -28,6 +47,36 @@ spring:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 3072
           cpu: 2
+    task:
+      initialize:
+        enable: false
+  batch:
+    initializer:
+      enabled: false
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+logging:
+  level:
+    com.pemc: debug
 
 batch:
   # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
+  chunkSize: 1
+  maxWorkers: 10
+  partitionSize:
+    mtr: 1000
+
+mtr:
+  directory: /tmp/
+
+sftp:
+  credentials:
+    username: pemc
+    password: 123qwe
+    host: sftp.marathon.l4lb.thisdcos.directory
+    port: 22
+    workingDirectory: /upload
+    privateKey:

crss-settlement-task-calculation-addtlcomp/application-devlocal.yml

@@ -0,0 +1,87 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_settlement
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
+  # for removal after ITER 7 stl testing
+  crss-meterprocess:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_metering
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_nmms
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  batch:
+    job:
+      enabled: true
+
+  redis:
+      host: localhost
+      port: 6379
+
+batch:
+  resourceLocation: "file:target/libs/crss-settlement-task-calculation-addtlcomp-2.0.0.RC6.jar"
+  chunkSize: 100
+  maxWorkers: 2
+  partitionSize:
+    ac: 15
+    acAlloc: 15
+    vatAc: 15
+    vatAcAlloc: 15
+    acGmr: 15
+
+logging:
+  level:
+    com.pemc.crss.settlement.task.calculation.addtlcomp: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-dev.yml

@@ -5,6 +5,8 @@ spring:
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
@@ -12,30 +14,73 @@ spring:
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_metering
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_nmms
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
 
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
 
+  batch:
+    job:
+      enabled: true
 
+  redis:
+      host: localhost
+      port: 6379
+
+batch:
+  chunkSize: 100
+  maxWorkers: 2
+  partitionSize:
+    ac: 1500
+    acAlloc: 1500
+    vatAc: 1500
+    vatAcAlloc: 1500
+    acGmr: 1500
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-dev2.yml

@@ -5,6 +5,9 @@ spring:
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
@@ -12,27 +15,80 @@ spring:
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
       username: crss_metering
       password: crss_metering
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+  profiles:
+      include: mesos
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 2048
+    task:
+      initialize:
+        enable: false
+  batch:
+    initializer:
+      enabled: false
+    job:
+      enabled: true
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+logging:
+  level:
+    com.pemc.crss.settlement.task.calculation.addtlcomp: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

crss-settlement-task-calculation/crss-settlement-task-calculation-dev2.yml

@@ -5,6 +5,9 @@ spring:
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
@@ -12,27 +15,80 @@ spring:
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
       username: crss_metering
       password: crss_metering
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+  profiles:
+    include: mesos
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 2048
+    task:
+      initialize:
+        enable: false
+  batch:
+    initializer:
+      enabled: false
+    job:
+      enabled: true
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: none
+        hbm2ddl:
+          auto: none
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+logging:
+  level:
+    com.pemc.crss.settlement.task.calculation: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

crss-settlement-task-calculation/crss-settlement-task-calculation-devlocal.yml

@@ -0,0 +1,102 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_settlement
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+  # for removal after ITER 7 stl testing
+  crss-meterprocess:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_metering
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_nmms
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 20
+      test-on-borrow: true
+      validation-query: SELECT 1
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  batch:
+    job:
+      enabled: true
+
+batch:
+  resourceLocation: "file:target/libs/crss-settlement-task-calculation-2.0.0.RC6.jar"
+  chunkSize: 100
+  maxWorkers: 2
+  partitionSize:
+    retDat: 1500
+    retBcq: 1500
+    calcEta: 1500
+    disAggBcq: 1500
+    disAggBcqSeller: 1500
+    disAggBcqBuyer: 1500
+    procNss: 1500
+    nss: 1500
+    rta: 1500
+    rprta: 1500
+    rcra: 1500
+    sFactor: 1500
+    runway: 1500
+    spotSeller: 1500
+    spotBuyer: 1500
+    gmr: 1500
+    energyMf: 1500
+    reserveMf: 1500
+
+logging:
+  level:
+    com.pemc.crss.settlement.task.calculation: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-uat-default.yml

@@ -5,6 +5,8 @@ spring:
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
@@ -12,30 +14,76 @@ spring:
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=metering
       username: crss_metering
       password: crss_metering
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  profiles:
+    include: mesos
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 4096
+    task:
+      initialize:
+        enable: false
+  batch:
+    initializer:
+      enabled: false
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  batch:
+    job:
+      enabled: true
 
   redis:
     database: 5
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-uat-sit.yml

@@ -5,6 +5,8 @@ spring:
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
@@ -12,30 +14,75 @@ spring:
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
       username: crss_metering
       password: crss_metering
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  profiles:
+    include: mesos
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 8192
+          cpu: 2
+    task:
+      initialize:
+        enable: false
+  batch:
+    initializer:
+      enabled: false
+    job:
+      enabled: true
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
 
   redis:
-    database: 4
+    database: 5
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

crss-settlement-task-calculation/crss-settlement-task-calculation.yml

@@ -62,6 +62,29 @@ spring:
     host: localhost
     port: 6379
 
+batch:
+  chunkSize: 100
+  maxWorkers: 10
+  partitionSize:
+    retDat: 1500
+    retBcq: 1500
+    calcEta: 1500
+    disAggBcq: 1500
+    disAggBcqSeller: 1500
+    disAggBcqBuyer: 1500
+    procNss: 1500
+    nss: 1500
+    rta: 1500
+    rprta: 1500
+    rcra: 1500
+    sFactor: 1500
+    runway: 1500
+    spotSeller: 1500
+    spotBuyer: 1500
+    gmr: 1500
+    energyMf: 1500
+    reserveMf: 1500
+
 logging:
   level:
     com.pemc: DEBUG

crss-settlement-task-validation/application-pemc-uat-sit.yml

@@ -0,0 +1,84 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
+  # for removal after ITER 7 stl testing
+  crss-meterprocess:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmms
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  batch:
+    job:
+      enabled: true
+
+  redis:
+    database: 5
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

crss-settlement-task-validation/crss-settlement-task-validation-dev.yml

@@ -5,12 +5,17 @@ spring:
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/crss?currentSchema=registration
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
@@ -18,28 +23,59 @@ spring:
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_meterprocess
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_metering
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/stl_crss_nmms
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 20
 
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  batch:
+    job:
+      enabled: true
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

crss-ui/crss-ui-pemc-uat-sit.yml

@@ -15,4 +15,4 @@ data-extraction-service:
     listOfServers: http://crss-uat-sitcrss1data-extraction-service.marathon.l4lb.thisdcos.directory:8080
 settlement-service:
   ribbon:
-    listOfServers: http://crss-uat-sitcrss2crss-settlement-app.marathon.l4lb.thisdcos.directory:8082
+    listOfServers: http://crss-uat-sitcrss2settlement-app.marathon.l4lb.thisdcos.directory:8082

ui-bsmd/ui-bsmd-devlocal.yml

@@ -0,0 +1,12 @@
+crss-meterprocess-app:
+  ribbon:
+    listOfServers: http://localhost:9091
+crss-settlement-app:
+  ribbon:
+    listOfServers: http://localhost:9093
+crss-dataflow-app:
+  ribbon:
+    listOfServers: http://localhost:9092
+crss-admin:
+  ribbon:
+    listOfServers: http://localhost:8082