renamed configs

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

@@ -4,8 +4,6 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?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:
@@ -13,65 +11,37 @@ spring:
       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-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
 
   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: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-    database: 5
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.hibernate.stat: debug
+    database: 5

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

@@ -4,16 +4,12 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
-      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
   # for removal after ITER 7 stl testing
   crss-meterprocess:
@@ -21,7 +17,6 @@ spring:
       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-main:
@@ -29,46 +24,18 @@ spring:
       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
 
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQL81Dialect
-        ddl-auto: validate
-        hbm2ddl:
-          import_files:
-
-  batch:
-    job:
-      enabled: true
-
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
     database: 5
 
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.hibernate.stat: debug
-
 report:
   directory:
     base: report/
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload/stl
-    privateKey:
+    workingDirectory: /upload/stl

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

@@ -1,85 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_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_reg
-      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:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_meterprocess
-      username: crss_settlement
-      password: crss_settlement
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_meterprocess
-      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/stl_crss_metering
-      username: crss_settlement
-      password: crss_settlement
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
-  crss-nmms:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_nmms
-      username: crss_settlement
-      password: crss_settlement
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 2
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_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: true
-        dialect: org.hibernate.dialect.PostgreSQL81Dialect
-        ddl-auto: validate
-        hbm2ddl:
-          import_files:
-
-  batch:
-    job:
-      enabled: true
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.hibernate.stat: debug

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

@@ -4,83 +4,43 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?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_uat?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_uat?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_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
 
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQL81Dialect
-        ddl-auto: validate
-        hbm2ddl:
-          import_files:
-
-  batch:
-    job:
-      enabled: true
-
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
     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-pemc-uat.yml

@@ -4,6 +4,7 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_settlement
       username: crss_settlement
       password: crss_settlement
+      maxPoolSize: 2
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg
@@ -14,26 +15,31 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_meterprocess
       username: crss_settlement
       password: crss_settlement
+      maxPoolSize: 2
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_meterprocess
       username: crss_settlement
       password: crss_settlement
+      maxPoolSize: 2
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_metering
       username: crss_settlement
       password: crss_settlement
+      maxPoolSize: 2
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/stl_crss_nmms
       username: crss_settlement
-      password: crss_settlemen
+      password: crss_settlement
+      maxPoolSize: 2
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
+      maxPoolSize: 2
 
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+    host: redis.marathon.l4lb.thisdcos.directory