Merge branch '2.0.x' into 2.0.x

crss-admin/crss-admin-pemc-top-sit.yml

@@ -0,0 +1,32 @@
+spring:
+  datasource:
+    url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=admin
+    username: crss_admin
+    password: YReYA7fI
+  mail:
+    host: mailserver.marathon.l4lb.thisdcos.directory
+    port: 3025
+    username: crss@top.crss.wesm.ph
+    password: P@ssw0rd1434412
+    properties:
+        transport.protocol: smtp
+        smtp:
+          auth: true
+          starttls.enable: true
+
+crss:
+  ldap:
+    protocol: LDAPS
+    host: "10.176.24.26"
+    port: 636
+    root-dn: "dc=wesmsys,dc=local"
+    user-search-base: ""
+    admin-user: "wesmsys\\crssadmin"
+    admin-password: "123qweASD"
+    username-field: "userPrincipalName"
+    domain: "wesmsys.local"
+    embedded: false
+    passwordOpEnabled: true
+  mail:
+    signature:
+      root-dir: /crss-uat-sit/esig

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

@@ -28,4 +28,7 @@ crss:
     username-field: "userPrincipalName"
     domain: "wesmsys.local"
     embedded: false
-    passwordOpEnabled: true
+    passwordOpEnabled: true
+  mail:
+    signature:
+      root-dir: /crss-uat-sit/esig

crss-admin/crss-admin-top.yml

@@ -13,6 +13,8 @@ spring:
         smtp:
           auth: true
           starttls.enable: true
+    subject:
+        prefix: "[CRSS 2.0 - Trial Operation]"
 crss:
   ldap:
     protocol: LDAP
@@ -25,4 +27,4 @@ crss:
     username-field: "userPrincipalName"
     domain: "wesmsys.local"
     embedded: false
-    passwordOpEnabled: false
+    passwordOpEnabled: false

crss-admin/crss-admin.yml

@@ -10,6 +10,9 @@ spring:
   resources:
     chain:
       gzipped: true
+  mail:
+    subject:
+      prefix: ""
 feign:
   hystrix:
     enabled: false
@@ -21,4 +24,4 @@ crss:
       DOE: DOE@mail.com
       ERC: ERC@mail.com
       PEMBOARD: PEMBOARD@mail.com
-      MSP: MSP@mail.com
+      MSP: MSP@mail.com

crss-audit/application-dev2.yml

@@ -5,7 +5,7 @@ spring:
       username: crss_audit
       password: crss_audit
       driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
+      maxPoolSize: 2
       connectionTimeout: 10000
       test-on-borrow: true
       validation-query: SELECT 1

crss-audit/application-pemc-uat-default.yml

@@ -20,7 +20,7 @@ spring:
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
     port: 6379
-    database: 4
+    database: 5
 
 server:
   port: 9094

crss-data/crss-data-top.yml

@@ -14,8 +14,8 @@ crss:
     datasource:
       platform: postgresql
       url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataextraction
-      username: crss_dw
-      password: etPyY3k8
+      username: crss_dataextraction
+      password: xgZx2FqM
   registration:
      datasource:
        url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration

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

@@ -5,7 +5,7 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
+      maxPoolSize: 2
       connectionTimeout: 10000
       test-on-borrow: true
       validation-query: SELECT 1

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

@@ -14,6 +14,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQLDialect
         ddl-auto: update
         hbm2ddl:
@@ -24,11 +25,15 @@ spring:
     job:
       enabled: false
 
+  redis:
+    host: localhost
+    port: 6379
+
 #liquibase:
 #  change-log: classpath:/db/db.changelog-master.xml
 
 server:
-  port: 8081
+  port: 9092
   undertow:
     accesslog:
       dir: target
@@ -38,18 +43,18 @@ server:
     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
+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:
@@ -74,3 +79,6 @@ sftp:
 todi-config:
   dispatch-interval: 5
   max-retry: 2
+
+crss:
+  api.gateway: http://localhost:8080

crss-dataflow-app/crss-dataflow-app-pemc-uat-default.yml

@@ -25,7 +25,7 @@ spring:
       enabled: false
 
   redis:
-    database: 4
+    database: 5
 
 #liquibase:
 #  change-log: classpath:/db/db.changelog-master.xml

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

@@ -15,7 +15,7 @@ spring:
       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
@@ -72,9 +72,9 @@ sftp:
   credentials:
     username: pemc
     password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/sow7
+    host: 10.176.24.25
+    port: 2222
+    workingDirectory: /upload/rbcq
     privateKey:
 
 database:

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

@@ -10,9 +10,9 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
+      username: crss_reg
+      password: crss_reg
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true

crss-meterprocess-app/crss-meterprocess-app-pemc-uat-default.yml

@@ -1,6 +1,6 @@
 spring:
   redis:
-    database: 4
+    database: 5
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
@@ -86,5 +86,5 @@ sftp:
     password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
     port: 22
-    workingDirectory: /upload/mq
+    workingDirectory: /upload
     privateKey:

crss-meterprocess-app/crss-meterprocess-app-pemc-uat-sit.yml

@@ -86,5 +86,5 @@ sftp:
     password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
     port: 22
-    workingDirectory: /upload/mq
+    workingDirectory: /upload
     privateKey:

crss-meterprocess-app/crss-meterprocess-app-pemc-uat.yml

@@ -84,5 +84,5 @@ sftp:
     password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
     port: 22
-    workingDirectory: /upload/mq
+    workingDirectory: /upload
     privateKey:

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-pemc-uat-default.yml

@@ -38,6 +38,8 @@ spring:
             auto: none
           temp:
             use_jdbc_metadata_defaults: false
+  redis:
+      database: 5
 logging:
   level:
     com.pemc: debug

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-pemc-uat-sit.yml

@@ -38,6 +38,8 @@ spring:
             auto: none
           temp:
             use_jdbc_metadata_defaults: false
+  redis:
+    database: 4
 logging:
   level:
     com.pemc: debug

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

@@ -6,9 +6,9 @@ spring:
           content-type: application/json
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
+      username: crss_reg
+      password: crss_reg
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true

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

@@ -10,18 +10,18 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_metering2
-      username: crss_metering2
-      password: crss_metering2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_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_reg2
-      username: crss_reg2
-      password: crss_reg2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
+      username: crss_reg
+      password: crss_reg
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
@@ -39,6 +39,7 @@ spring:
           auto: none
         temp:
           use_jdbc_metadata_defaults: false
+        default_schema: public
 
   cloud:
     stream:

crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-pemc-uat-default.yml

@@ -46,6 +46,9 @@ spring:
         output:
           content-type: application/json
 
+  redis:
+      database: 5
+
 logging:
   level:
     com.pemc: debug

crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-pemc-uat-sit.yml

@@ -46,6 +46,9 @@ spring:
         output:
           content-type: application/json
 
+  redis:
+    database: 4
+
 logging:
   level:
     com.pemc: debug

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

@@ -3,9 +3,9 @@ spring:
   profiles: dailyExtract
   datasource:
     driver-class-name: org.postgresql.Driver
-    password: crss_metering2
-    username: crss_metering2
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering2
+    password: crss_metering
+    username: crss_metering
+    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
     maxPoolSize: 5
     test-on-borrow: true
     validation-query: SELECT 1
@@ -15,8 +15,8 @@ spring:
         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 public.txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
+  update: "update public.txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
 
 trigger:
   fixed-delay: 5
@@ -33,9 +33,9 @@ spring:
   profiles: monthlyExtract
   datasource:
     driver-class-name: org.postgresql.Driver
-    password: crss_metering2
-    username: crss_metering2
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering2
+    password: crss_metering
+    username: crss_metering
+    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
     maxPoolSize: 5
     test-on-borrow: true
     validation-query: SELECT 1
@@ -45,8 +45,8 @@ spring:
         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 public.txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
+  update: "update public.txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
 
 trigger:
   fixed-delay: 5
@@ -62,9 +62,9 @@ logging:
 spring:
   datasource:
     driver-class-name: org.postgresql.Driver
-    password: crss_metering2
-    username: crss_metering2
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering2
+    password: crss_metering
+    username: crss_metering
+    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
     maxPoolSize: 5
     test-on-borrow: true
     validation-query: SELECT 1
@@ -74,8 +74,8 @@ spring:
         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 public.txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
+  update: "update public.txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
 
 trigger:
   fixed-delay: 5

crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-pemc-uat-default.yml

@@ -14,6 +14,8 @@ spring:
       bindings:
         output:
           content-type: application/json
+  redis:
+      database: 5
 jdbc:
   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);"
@@ -44,6 +46,8 @@ spring:
       bindings:
         output:
           content-type: application/json
+  redis:
+    database: 5
 jdbc:
   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);"

crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-pemc-uat-sit.yml

@@ -14,6 +14,8 @@ spring:
       bindings:
         output:
           content-type: application/json
+  redis:
+    database: 4
 jdbc:
   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);"

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

@@ -19,9 +19,9 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
+      username: crss_reg
+      password: crss_reg
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
@@ -84,5 +84,5 @@ sftp:
     password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
     port: 22
-    workingDirectory: /upload
+    workingDirectory: /upload/mq
     privateKey:

crss-mtr/crss-mtr-dev2.yml

@@ -19,9 +19,9 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
+      username: crss_reg
+      password: crss_reg
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
@@ -44,7 +44,8 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
+          memory: 3072
+          cpu: 2
     task:
       initialize:
         enable: false

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

@@ -14,7 +14,7 @@ spring:
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
+      maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
@@ -23,16 +23,16 @@ spring:
       username: crss_registration
       password: crss_registration
       driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
+      maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   jpa:
-    show-sql: true
+    show-sql: false
     generate-ddl: true
     open-in-view: false
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQLDialect
         ddl-auto: none
         hbm2ddl:
@@ -44,7 +44,8 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 4096
+          memory: 8192
+          cpu: 2
     task:
       initialize:
         enable: false

crss-reg/crss-reg-pemc-uat-default.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+    url: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=registration
     username: crss_registration
     password: crss_registration
   xdf-control:

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

@@ -11,10 +11,10 @@ spring:
       driverClassName: oracle.jdbc.OracleDriver
 crss:
   docmgt:
-    root-dir: /crss/docmgt
+    root-dir: /crss-uat-sit/docmgt
   xdf:
     client-type: sftp  # OPTIONS:[local, ftp, sftp]
-    root-folder: /upload/xdf
+    root-folder: /crss-uat-sit/upload/xdf
     auto-create-dir: true
     file-encoding: UTF-8
     file-exists-mode: fail  # OPTIONS:[append, append_no_flush, fail, ignore, replace]

crss-reg/crss-reg-top.yml

@@ -3,11 +3,11 @@ spring:
     url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
     username: crss_registration
     password: 51UF3JA9
-  xdf-control: # TODO: this is just temporary while waiting to oracle conn info
-    datasource:
-      url: jdbc:edb://10.176.11.23:5432/dor_rt
-      username: dor_rt
-      password: dor_rt
+  #xdf-control: # TODO: this is just temporary while waiting to oracle conn info
+    #datasource:
+      #url: jdbc:edb://10.176.11.23:5432/dor_rt
+      #username: dor_rt
+      #password: dor_rt
 crss:
   docmgt:
     root-dir: /crss/docmgt

crss-sched/crss-sched-metronome.yml

@@ -1,8 +1,8 @@
 metronome:
   job-list: ENERGY_PRICE_IMPORT_SCHED, RESERVED_PRICE_IMPORT_SCHED, RESERVED_BCQ_IMPORT_SCHED, RTU_IMPORT_SCHED
-  get-job: http://192.168.233.2/service/metronome/v1/jobs/{jobName}
-  put-job: http://192.168.233.2/service/metronome/v0/scheduled-jobs/{jobName}
-  get-sched: http://192.168.233.2/service/metronome/v1/jobs/{jobName}/schedules/default
+  get-job: http://master.mesos/service/metronome/v1/jobs/{jobName}
+  put-job: http://master.mesos/service/metronome/v0/scheduled-jobs/{jobName}
+  get-sched: http://master.mesos/service/metronome/v1/jobs/{jobName}/schedules/default
   schedules-json-template:
     '"schedules": [{
       "id": "default",

crss-sched/crss-sched-top.yml

@@ -1,4 +1,5 @@
 spring:
+  profiles.include: metronome
   datasource:
     url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=scheduler
     username: crss_scheduler

crss-settlement-app/crss-settlement-app-pemc-uat-default.yml

@@ -18,7 +18,7 @@ spring:
         hbm2ddl:
           import_files:
   redis:
-    database: 4
+    database: 5
 
   # prevent batch job from running on app start
   batch:

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

@@ -60,7 +60,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

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

@@ -54,6 +54,22 @@ spring:
       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
@@ -66,10 +82,6 @@ spring:
         hbm2ddl:
           import_files:
 
-  batch:
-    job:
-      enabled: true
-
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
     port: 6379

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

@@ -54,7 +54,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:
@@ -68,6 +68,17 @@ spring:
       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

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

@@ -67,6 +67,7 @@ spring:
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
     port: 6379
+    database: 5
 
 logging:
   level:

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

@@ -0,0 +1,88 @@
+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
+  # 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=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: 5
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

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

@@ -54,7 +54,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

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

@@ -40,6 +40,7 @@ spring:
     generate-ddl: false
     properties:
       hibernate:
+        generate_statistics: false
         # dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

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

@@ -54,7 +54,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:
@@ -68,6 +68,16 @@ spring:
       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

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

@@ -60,7 +60,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

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

@@ -54,6 +54,22 @@ spring:
       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
@@ -66,11 +82,6 @@ spring:
         hbm2ddl:
           auto: none
 
-
-  batch:
-    job:
-      enabled: true
-
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
     port: 6379

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

@@ -60,7 +60,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:
@@ -70,6 +70,30 @@ spring:
     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

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

@@ -48,13 +48,27 @@ spring:
       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: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:
@@ -65,7 +79,7 @@ spring:
       enabled: true
 
   redis:
-    database: 4
+    database: 5
 
 logging:
   level:

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

@@ -48,24 +48,37 @@ spring:
       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: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:
           import_files:
 
-  batch:
-    job:
-      enabled: true
-
   redis:
-    database: 4
+    database: 5
 
 logging:
   level:

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

@@ -54,7 +54,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

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

@@ -54,7 +54,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

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

@@ -54,7 +54,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:
@@ -64,6 +64,29 @@ spring:
     job:
       enabled: true
 
+batch:
+  chunkSize: 100
+  maxWorkers: 10
+  partitionSize:
+    retDat: 22500
+    retBcq: 15000
+    calcEta: 30000
+    procNss: 30000
+    nss: 30000
+    disAggBcq: 30000
+    disAggBcqBuyer: 30000
+    disAggBcqSeller: 30000
+    rta: 2250
+    rprta: 30000
+    rcra: 30000
+    sFactor: 15000
+    runway: 15000
+    spotSeller: 1500
+    spotBuyer: 1500
+    gmr: 1500
+    energyMf: 1500
+    reserveMf: 1500
+
 logging:
   level:
     com.pemc: DEBUG

crss-settlement-task-file-gen-addtlcomp/application-dev.yml

@@ -40,7 +40,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-file-gen-addtlcomp/application-devoracle.yml

@@ -21,6 +21,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
+        generate_statistics: false
         dialect: org.hibernate.dialect.Oracle10gDialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-file-gen-addtlcomp/application-pemc-uat-default.yml

@@ -38,7 +38,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:
@@ -51,6 +51,7 @@ spring:
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
     port: 6379
+    database: 5
 
 logging:
   level:

crss-settlement-task-file-gen-addtlcomp/application-pemc-uat.yml

@@ -38,7 +38,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-file-gen-addtlcomp/application-qa.yml

@@ -38,7 +38,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-file-gen-addtlcomp/application.yml

@@ -40,7 +40,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-dev.yml

@@ -40,7 +40,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-devlocal.yml

@@ -38,7 +38,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-devoracle.yml

@@ -21,6 +21,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
+        generate_statistics: false
         dialect: org.hibernate.dialect.Oracle10gDialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-uat-default.yml

@@ -4,7 +4,7 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
-      driverClassName: org.postgresql.Driverhd
+      driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
       maxPoolSize: 2
   crss-dataflow:
@@ -38,7 +38,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:
@@ -49,7 +49,8 @@ spring:
       enabled: true
 
   redis:
-    database: 4
+    database: 5
+
 
 logging:
   level:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-uat-sit.yml

@@ -38,7 +38,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-uat.yml

@@ -38,7 +38,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-qa.yml

@@ -38,7 +38,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation.yml

@@ -40,7 +40,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

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

@@ -69,7 +69,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-validation/application-devlocal.yml

@@ -63,7 +63,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-validation/application-devoracle.yml

@@ -62,6 +62,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
+        generate_statistics: false
         dialect: org.hibernate.dialect.Oracle10gDialect
         ddl-auto: update
         hbm2ddl:

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

@@ -63,7 +63,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:
@@ -76,6 +76,7 @@ spring:
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
     port: 6379
+    database: 5
 
 logging:
   level:

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/application-pemc-uat.yml

@@ -63,7 +63,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-validation/application-qa.yml

@@ -63,7 +63,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-validation/application-top.yml

@@ -40,6 +40,7 @@ spring:
     generate-ddl: false
     properties:
       hibernate:
+        generate_statistics: false
         # dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:

crss-settlement-task-validation/application.yml

@@ -63,7 +63,7 @@ spring:
     generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQL81Dialect
         ddl-auto: validate
         hbm2ddl:
@@ -73,10 +73,6 @@ spring:
     job:
       enabled: true
 
-  redis:
-      host: localhost
-      port: 6379
-
 logging:
   level:
     com.pemc: 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

ui-bsmd/ui-bsmd-pemc-uat-default.yml

@@ -25,6 +25,12 @@ zuul:
     admin:
       path: /admin/**
       serviceId: crss-admin
+    registration:
+      path: /registration/**
+      serviceId: crss-reg
+    crss-audit:
+      path: /audit/**
+      serviceId: crss-audit
 
 crss-meterprocess-app:
   ribbon: