cleanup configurations ftw

crss-audit/crss-audit-qa.yml

@@ -5,11 +5,3 @@ spring:
       username: admin
       password: password
       driverClassName: org.postgresql.Driver
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
-    resource:
-      userInfoUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/user

crss-audit/crss-audit-top.yml

@@ -5,10 +5,3 @@ spring:
       username: crss_audit
       password: S0CuFyj6
 
-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

crss-audit/crss-audit.yml

@@ -15,6 +15,14 @@ spring:
         hbm2ddl:
           auto: none
 
+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
+
 server:
   port: 9094
   undertow:

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

@@ -6,14 +6,6 @@ spring:
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
 
-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

crss-dataflow-app/crss-dataflow-app-qa.yml

@@ -6,14 +6,6 @@ spring:
       password: password
       driverClassName: org.postgresql.Driver
 
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
-    resource:
-      userInfoUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/user
-
 sftp:
   credentials:
     host: sftp.marathon.l4lb.thisdcos.directory

crss-dataflow-app/crss-dataflow-app-top-sit.yml

@@ -8,10 +8,10 @@ spring:
 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
+      accessTokenUri: http://crss-top-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-top-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
     resource:
-      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
+      userInfoUri: http://crss-top-sitcrss1admin-service.marathon.l4lb.thisdcos.directory:8080/user
 
 dataflow:
   url: http://crss-top-sitspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393

crss-dataflow-app/crss-dataflow-app-top.yml

@@ -5,14 +5,6 @@ spring:
       username: crss_dataflow
       password: lgcCpwy0
 
-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
-
 sftp:
   credentials:
     host: sftp.marathon.l4lb.thisdcos.directory

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

@@ -25,6 +25,14 @@ spring:
 #liquibase:
 #  change-log: classpath:/db/db.changelog-master.xml
 
+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
+
 server:
   port: 8082
   undertow:

crss-meterprocess-app/crss-meterprocess-app-dev.yml

@@ -1,32 +1,41 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_nmms
-      username: admin
-      password: password
-
-  jpa:
-    generate-ddl: true
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_nmms
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
 
 server:
   port: 8081
 
-
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://localhost:9393
 
 security:
-  ignored: /**
+  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
 
 management:
   security:
@@ -34,5 +43,9 @@ management:
 
 sftp:
   credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+    username: pemc
+    password: 123qwe
+    host: pemc-storage.southeastasia.cloudapp.azure.com
+    port: 22
+    workingDirectory: /home/pemc/upload
+    privateKey:

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

@@ -4,35 +4,16 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
       username: crss_reg2
       password: crss_reg2
+      driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_nmms
       username: crss_nmms
       password: crss_nmms
-
-  jpa:
-    generate-ddl: true
-
-server:
-  port: 8081
-
-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
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+      driverClassName: org.postgresql.Driver

crss-meterprocess-app/crss-meterprocess-app-devoracle.yml

@@ -1,23 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_main
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-      maxPoolSize: 20
-  crss-registration:
-    datasource:
-      connectionTimeout: 10000
-      maxPoolSize: 20
-
-  jpa:
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        ddl-auto: update
-
-server:
-  port: 8081

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

@@ -1,28 +1,25 @@
 spring:
-  redis:
-    database: 5
   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
   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
   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
 
-  jpa:
-    show-sql: false
-    generate-ddl: true
-
-server:
-  port: 8081
+  redis:
+    database: 5
 
 security:
   oauth2:
@@ -35,7 +32,4 @@ security:
 dataflow:
   url: http://crss-uat-defaultspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+

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

@@ -1,27 +1,25 @@
 spring:
-  redis:
-    database: 4
   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
   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
   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
 
-  jpa:
-    generate-ddl: true
-
-server:
-  port: 8081
+  redis:
+    database: 4
 
 security:
   oauth2:
@@ -34,7 +32,4 @@ security:
 dataflow:
   url: http://crss-uat-sitspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+

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

@@ -1,38 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
-  crss-nmms:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
-
-  jpa:
-    generate-ddl: true
-
-server:
-  port: 8081
-
-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
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload

crss-meterprocess-app/crss-meterprocess-app-qa.yml

@@ -4,43 +4,16 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
+      driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
       username: admin
       password: password
+      driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_nmms
       username: admin
       password: password
-
-  jpa:
-    generate-ddl: true
-
-server:
-  port: 8081
-
-eureka:
-  instance:
-    prefer-ip-address: false
-    hostname: crss-meterprocess-app.marathon.l4lb.thisdcos.directory
-  client:
-    serviceUrl:
-      defaultZone: http://crss-discovery.marathon.l4lb.thisdcos.directory:8761/eureka/
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
-    resource:
-      userInfoUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/user
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+      driverClassName: org.postgresql.Driver

crss-meterprocess-app/crss-meterprocess-app-qaoracle.yml

@@ -1,29 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      #jdbcUrl: jdbc:oracle:thin:@pemc-storage.southeastasia.cloudapp.azure.com:1521:XE
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-      maxPoolSize: 20
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      #jdbcUrl: jdbc:oracle:thin:@pemc-storage.southeastasia.cloudapp.azure.com:1521:XE
-      username: crss_reg
-      password: crss_reg
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-      maxPoolSize: 20
-
-  jpa:
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        ddl-auto: update
-
-server:
-  port: 8081

crss-meterprocess-app/crss-meterprocess-app-top-sit.yml

@@ -15,12 +15,6 @@ spring:
       username: crss_sit_nmms
       password: tEglXBQd
 
-  jpa:
-    generate-ddl: true
-
-server:
-  port: 8081
-
 security:
   oauth2:
     client:
@@ -32,7 +26,3 @@ security:
 dataflow:
   url: http://crss-top-sitspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload

crss-meterprocess-app/crss-meterprocess-app-top.yml

@@ -0,0 +1,16 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: D9JpfUtT
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: 51UF3JA9
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=nmms
+      username: crss_nmms
+      password: lbgg1i2Y

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

@@ -1,28 +1,22 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
+      connectionTimeout: 10000
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
+      connectionTimeout: 10000
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_nmms
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
+      connectionTimeout: 10000
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
@@ -43,6 +37,15 @@ spring:
     job:
       enabled: false
 
+
+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
+
 #liquibase:
 #  change-log: classpath:/db/db.changelog-master.xml
 
@@ -57,33 +60,6 @@ server:
     enabled: true
     min-response-size: 1
 
-eureka:
-  instance:
-    prefer-ip-address: true
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
-#          healthcheck:
-#            enabled: true
-#    lease:
-#      duration: 5
-#  instance:
-#    leaseRenewalIntervalInSeconds: 1
-#    leaseExpirationDurationInSeconds: 2
-
-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
@@ -93,16 +69,14 @@ logging:
     org.hibernate.stat: debug
 
 dataflow:
-  url: http://localhost:9393
+  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 job:
   maxRun: 1
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/upload
-    privateKey:
+    host: sftp.marathon.l4lb.thisdcos.directory
+    workingDirectory: /upload
+
+

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-dev.yml

@@ -1,16 +1,19 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_metering
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_metering
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-dev2.yml

@@ -4,13 +4,16 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_metering2
       username: crss_metering2
       password: crss_metering2
+      driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
       username: crss_reg2
-      password: crss_reg2
+      password: crss_reg2
+      driverClassName: org.postgresql.Driver

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-devoracle.yml

@@ -1,26 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_main
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_metering
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_reg
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect

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

@@ -4,16 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
   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
   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
 
   redis:
       database: 5

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

@@ -4,16 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
   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
   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
 
   redis:
     database: 4

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

@@ -1,16 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-      username: crss_metering2
-      password: crss_metering2
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-qa.yml

@@ -4,13 +4,16 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
+      driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering
       username: admin
       password: password
+      driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
       username: admin
-      password: password
+      password: password
+      driverClassName: org.postgresql.Driver

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-qaoracle.yml

@@ -1,26 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_metering
-      password: crss_metering
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_reg
-      password: crss_reg
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink.yml

@@ -1,31 +1,26 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
+      connectionTimeout: 10000
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_metering
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
+      connectionTimeout: 10000
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
+      connectionTimeout: 10000
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
+
   jpa:
     show-sql: false
     hibernate:

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

@@ -1,19 +1,18 @@
 spring:
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
 
-  jpa:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+    host: localhost
+    port: 6379
+

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

@@ -4,16 +4,10 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
       username: crss_reg2
       password: crss_reg2
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-
-  jpa:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+      driverClassName: org.postgresql.Driver

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

@@ -1,28 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_main
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_metering
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_reg
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        hbm2ddl:
-          auto: none

crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-pemc-uat-default.yml

@@ -1,20 +1,16 @@
 spring:
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=registration
       username: crss_registration
       password: crss_registration
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-
-  jpa:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
+      driverClassName: org.postgresql.Driver
 
   redis:
     database: 5

crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-pemc-uat-sit.yml

@@ -4,17 +4,13 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-
-  jpa:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
+      driverClassName: org.postgresql.Driver
 
   redis:
     database: 4

crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-pemc-uat.yml

@@ -1,19 +0,0 @@
-spring:
-  crss-registration:
-    dataSource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  jpa:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory

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

@@ -4,11 +4,10 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
       username: admin
       password: password
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+      driverClassName: org.postgresql.Driver

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

@@ -1,22 +0,0 @@
-spring:
-  crss-registration:
-    dataSource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_reg
-      password: crss_reg
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-
-  jpa:
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        hbm2ddl:
-          auto: none

crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-top-sit.yml

@@ -9,11 +9,3 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
       username: crss_sit_meterprocess
       password: PmfXsUQp
-  jpa:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory

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

@@ -9,11 +9,3 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
-  jpa:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory

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

@@ -1,28 +1,25 @@
 spring:
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
+      connectionTimeout: 10000
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
+      connectionTimeout: 10000
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
 
+  cloud:
+    stream:
+      bindings:
+        output:
+          content-type: application/json
+
   jpa:
     show-sql: false
     hibernate:
@@ -34,9 +31,7 @@ spring:
         temp:
           use_jdbc_metadata_defaults: false
 
-  redis:
-    host: localhost
-    port: 6379
+
 logging:
   level:
     com.pemc: debug

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

@@ -1,16 +1,23 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_metering
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_metering
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
+
+  redis:
+      host: localhost
+      port: 6379

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

@@ -4,13 +4,16 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_metering2
       username: crss_metering2
       password: crss_metering2
+      driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
       username: crss_reg2
-      password: crss_reg2
+      password: crss_reg2
+      driverClassName: org.postgresql.Driver

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

@@ -1,22 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_main
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_metering
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 1000
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_reg
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000

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

@@ -4,16 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
   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
   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
 
   redis:
       database: 5

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

@@ -4,16 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
   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
   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
 
   redis:
     database: 4

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

@@ -1,16 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-      username: crss_metering2
-      password: crss_metering2
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2

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

@@ -4,13 +4,16 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
+      driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering
       username: admin
       password: password
+      driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
       username: admin
-      password: password
+      password: password
+      driverClassName: org.postgresql.Driver

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

@@ -1,22 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_metering
-      password: crss_metering
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_reg
-      password: crss_reg
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000

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

@@ -1,31 +1,26 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
+      connectionTimeout: 10000
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_metering
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
+      connectionTimeout: 10000
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
+      connectionTimeout: 10000
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
+
   jpa:
     show-sql: false
     hibernate:
@@ -44,6 +39,7 @@ spring:
       bindings:
         output:
           content-type: application/json
+
 logging:
   level:
     com.pemc: debug

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

@@ -2,9 +2,14 @@
 spring:
   profiles: dailyExtract
   datasource:
-    password: password
-    username: admin
-    url: jdbc:postgresql://192.168.236.2:5432/crss_metering
+    url: jdbc:postgresql://localhost:5432/crss_metering
+    username: postgres
+    password: postgres
+    driver-class-name: org.postgresql.Driver
+
+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);"
 
 ---
 
@@ -12,15 +17,26 @@ spring:
 spring:
   profiles: monthlyExtract
   datasource:
-    password: password
-    username: admin
-    url: jdbc:postgresql://192.168.236.2:5432/crss_metering
+    url: jdbc:postgresql://localhost:5432/crss_metering
+    username: postgres
+    password: postgres
+    driver-class-name: org.postgresql.Driver
+
+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);"
+
 
 ---
 
 # default
 spring:
   datasource:
-    password: password
-    username: admin
-    url: jdbc:postgresql://192.168.236.2:5432/crss_metering
+    url: jdbc:postgresql://locahost:5432/crss_metering
+    username: postgres
+    password: postgres
+    driver-class-name: org.postgresql.Driver
+
+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);"

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

@@ -2,9 +2,14 @@
 spring:
   profiles: dailyExtract
   datasource:
-    password: crss_metering2
-    username: crss_metering2
     url: jdbc:postgresql://192.168.233.9:5432/crss_metering2
+    username: crss_metering2
+    password: crss_metering2
+    driver-class-name: org.postgresql.Driver
+
+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);"
 
 ---
 
@@ -12,15 +17,28 @@ spring:
 spring:
   profiles: monthlyExtract
   datasource:
-    password: crss_metering2
-    username: crss_metering2
     url: jdbc:postgresql://192.168.233.9:5432/crss_metering2
+    username: crss_metering2
+    password: crss_metering2
+    driver-class-name: org.postgresql.Driver
+
+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);"
+
 
 ---
 
 # default
 spring:
   datasource:
-    password: crss_metering2
-    username: crss_metering2
     url: jdbc:postgresql://192.168.233.9:5432/crss_metering2
+    username: crss_metering2
+    password: crss_metering2
+    driver-class-name: org.postgresql.Driver
+
+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);"
+
+

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

@@ -1,74 +0,0 @@
-#daily extract
-spring:
-  profiles: dailyExtract
-  datasource:
-    driver-class-name: oracle.jdbc.driver.OracleDriver
-    password: crss
-    username: crss_meterprocess_metering
-    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-jdbc:
-  max-rows-per-poll: 1
-  query: "select * from txn_meter_data_daily where consumed <> 'Y' or consumed is null or consumed = ''"
-  split: true
-  update: "update txn_meter_data_daily set consumed = 'Y' where meter_data_id in (:meter_data_id)"
-
-trigger:
-#  cron: '0/1 * * * * ?'
-#  date-format: 'MM/dd/yyyy'
-  fixed-delay: 100
-  initial-delay: 100
-  max-messages: 1
-  time-unit: MILLISECONDS
-
-
-logging:
-  level:
-    org.springframework: DEBUG
-
----
-
-#Monthly extract
-spring:
-  profiles: monthlyExtract
-  datasource:
-    driver-class-name: oracle.jdbc.driver.OracleDriver
-    password: crss
-    username: crss_meterprocess_metering
-    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-jdbc:
-  max-rows-per-poll: 1
-  query: "select * from txn_meter_data_monthly where consumed <> 'Y' or consumed is null or consumed = ''"
-  split: true
-  update: "update txn_meter_data_monthly set consumed = 'Y' where meter_data_id in (:meter_data_id)"
-
-trigger:
-#  cron: '0/1 * * * * ?'
-#  date-format: 'MM/dd/yyyy'
-  fixed-delay: 100
-  initial-delay: 100
-  max-messages: 1
-  time-unit: MILLISECONDS
-
----
-
-# default
-spring:
-  datasource:
-    driver-class-name: oracle.jdbc.driver.OracleDriver
-    password: crss
-    username: crss_meterprocess_metering
-    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-
-jdbc:
-  max-rows-per-poll: 1
-  query: "select * from txn_meter_data_monthly where consumed <> 'Y' or consumed is null or consumed = ''"
-  split: true
-  update: "update txn_meter_data_monthly set consumed = 'Y' where meter_data_id in (:meter_data_id)"
-
-trigger:
-#  cron: '0/1 * * * * ?'
-#  date-format: 'MM/dd/yyyy'
-  fixed-delay: 100
-  initial-delay: 100
-  max-messages: 1
-  time-unit: MILLISECONDS

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

@@ -2,15 +2,13 @@
 spring:
   profiles: dailyExtract
   datasource:
-    password: crss_metering
-    username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
 
   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);"
+    database: 5
 
 ---
 
@@ -18,24 +16,24 @@ jdbc:
 spring:
   profiles: monthlyExtract
   datasource:
-    password: crss_metering
-    username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
 
   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);"
 
 ---
 
 # default
 spring:
   datasource:
-    password: crss_metering
-    username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
-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);"
+    username: crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
+
+  redis:
+    database: 5
+

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

@@ -2,14 +2,13 @@
 spring:
   profiles: dailyExtract
   datasource:
-    password: crss_metering
-    username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
+
   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);"
 
 ---
 
@@ -17,24 +16,24 @@ jdbc:
 spring:
   profiles: monthlyExtract
   datasource:
-    password: crss_metering
-    username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
+
   redis:
     database: 4
-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);"
 
 ---
 
 # default
 spring:
   datasource:
-    password: crss_metering
-    username: crss_metering
     url: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
+    driver-class-name: org.postgresql.Driver
+
+  redis:
+    database: 4
 
-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.yml

@@ -1,26 +0,0 @@
-#daily extract
-spring:
-  profiles: dailyExtract
-  datasource:
-    password: crss_metering2
-    username: crss_metering2
-    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-
----
-
-#Monthly extract
-spring:
-  profiles: monthlyExtract
-  datasource:
-    password: crss_metering2
-    username: crss_metering2
-    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-
----
-
-# default
-spring:
-  datasource:
-    password: crss_metering2
-    username: crss_metering2
-    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2

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

@@ -2,10 +2,10 @@
 spring:
   profiles: dailyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
-    password: password
-    username: admin
     url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering
+    username: admin
+    password: password
+    driver-class-name: org.postgresql.Driver
 
 ---
 
@@ -13,16 +13,19 @@ spring:
 spring:
   profiles: monthlyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
-    password: password
-    username: admin
     url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering
+    username: admin
+    password: password
+    driver-class-name: org.postgresql.Driver
 
 ---
 
 # default
 spring:
   datasource:
-    password: password
-    username: admin
     url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering
+    username: admin
+    password: password
+    driver-class-name: org.postgresql.Driver
+
+

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

@@ -1,52 +0,0 @@
-#daily extract
-spring:
-  profiles: dailyExtract
-  datasource:
-    driver-class-name: oracle.jdbc.driver.OracleDriver
-    password: crss_metering
-    username: crss_metering
-    url: jdbc:oracle:thin:@10.64.0.4:1521:XE
-jdbc:
-  max-rows-per-poll: 1
-  query: "select * from txn_meter_data_daily where consumed <> 'Y' or consumed is null or consumed = ''"
-  split: true
-  update: "update txn_meter_data_daily set consumed = 'Y' where meter_data_id in (:meter_data_id)"
-
-trigger:
-#  cron: '0/1 * * * * ?'
-#  date-format: 'MM/dd/yyyy'
-  fixed-delay: 100
-  initial-delay: 100
-  max-messages: 1
-  time-unit: MILLISECONDS
-
-
-logging:
-  level:
-    org.springframework: DEBUG
-
----
-
-#Monthly extract
-spring:
-  profiles: monthlyExtract
-  datasource:
-    driver-class-name: oracle.jdbc.driver.OracleDriver
-    password: crss_metering
-    username: crss_metering
-    url: jdbc:oracle:thin:@10.64.0.4:1521:XE
-
-jdbc:
-  max-rows-per-poll: 1
-  query: "select * from txn_meter_data_monthly where consumed <> 'Y' or consumed is null or consumed = ''"
-  split: true
-  update: "update txn_meter_data_monthly set consumed = 'Y' where meter_data_id in (:meter_data_id)"
-
-trigger:
-#  cron: '0/1 * * * * ?'
-#  date-format: 'MM/dd/yyyy'
-  fixed-delay: 100
-  initial-delay: 100
-  max-messages: 1
-  time-unit: MILLISECONDS
-

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

@@ -2,9 +2,9 @@
 spring:
   profiles: dailyExtract
   datasource:
-    password: Fh7UcXpW
-    username: crss_metering
     url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
+    username: crss_metering
+    password: Fh7UcXpW
 
 ---
 
@@ -12,15 +12,17 @@ spring:
 spring:
   profiles: monthlyExtract
   datasource:
-    password: Fh7UcXpW
-    username: crss_metering
     url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
+    username: crss_metering
+    password: Fh7UcXpW
 
 ---
 
 # default
 spring:
   datasource:
-    password: Fh7UcXpW
-    username: crss_metering
     url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
+    username: crss_metering
+    password: Fh7UcXpW
+
+    

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

@@ -2,10 +2,7 @@
 spring:
   profiles: dailyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
-    password: postgres
-    username: postgres
-    url: jdbc:postgresql://localhost:5432/crss_metering
+    driver-class-name: com.edb.Driver
     maxPoolSize: 2
     test-on-borrow: true
     validation-query: SELECT 1
@@ -14,9 +11,10 @@ spring:
       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
@@ -32,10 +30,7 @@ logging:
 spring:
   profiles: monthlyExtract
   datasource:
-    driver-class-name: org.postgresql.Driver
-    password: postgres
-    username: postgres
-    url: jdbc:postgresql://localhost:5432/crss_metering
+    driver-class-name: com.edb.Driver
     maxPoolSize: 2
     test-on-borrow: true
     validation-query: SELECT 1
@@ -44,9 +39,11 @@ spring:
       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
@@ -61,10 +58,7 @@ logging:
 # default
 spring:
   datasource:
-    driver-class-name: org.postgresql.Driver
-    password: postgres
-    username: postgres
-    url: jdbc:postgresql://localhost:5432/crss_metering
+    driver-class-name: com.edb.Driver
     maxPoolSize: 2
     test-on-borrow: true
     validation-query: SELECT 1
@@ -73,9 +67,10 @@ spring:
       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

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-dev.yml

@@ -1,30 +1,19 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-nmms:
       datasource:
-        jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_nmms
-        username: admin
-        password: password
-  jpa:
-    show-sql: true
-    generate-ddl: true
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+        jdbcUrl: jdbc:postgresql://localhost:5432/crss_nmms
+        username: postgres
+        password: postgres
+        driverClassName: org.postgresql.Driver

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-dev2.yml

@@ -4,21 +4,23 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
   crss-nmms:
       datasource:
         jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_nmms
         username: crss_nmms
         password: crss_nmms
-  jpa:
-    show-sql: true
-    generate-ddl: true
+        driverClassName: org.postgresql.Driver
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
@@ -26,5 +28,4 @@ spring:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 1024
 
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-pemc-uat-default.yml

@@ -4,20 +4,23 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      driverClassName: org.postgresql.Driver
   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
   crss-nmms:
       datasource:
         jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
         username: crss_nmms
         password: crss_nmms
-  jpa:
-    generate-ddl: true
+        driverClassName: org.postgresql.Driver
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-pemc-uat-sit.yml

@@ -4,21 +4,23 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      driverClassName: org.postgresql.Driver
   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
   crss-nmms:
       datasource:
         jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
         username: crss_nmms
         password: crss_nmms
-  jpa:
-    show-sql: false
-    generate-ddl: true
+        driverClassName: org.postgresql.Driver
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-pemc-uat.yml

@@ -1,30 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-nmms:
-      datasource:
-        jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_nmms
-        username: crss_nmms
-        password: crss_nmms
-  jpa:
-    show-sql: false
-    generate-ddl: true
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-qa.yml

@@ -4,26 +4,26 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
       username: admin
       password: password
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
+      driverClassName: org.postgresql.Driver
   crss-nmms:
       datasource:
         jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_nmms
         username: admin
         password: password
-  jpa:
-    show-sql: false
-    generate-ddl: true
+        driverClassName: org.postgresql.Driver
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 1024
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-top-sit.yml

@@ -14,11 +14,10 @@ spring:
         jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms
         username: crss_sit_nmms
         password: tEglXBQd
-  jpa:
-    show-sql: false
-    generate-ddl: true
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-top.yml

@@ -14,11 +14,10 @@ spring:
         jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=nmms
         username: crss_nmms
         password: lbgg1i2Y
-  jpa:
-    show-sql: false
-    generate-ddl: true
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
@@ -26,5 +25,3 @@ spring:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 1024
 
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory

crss-meterprocess-task-stlready/crss-meterprocess-task-stlready.yml

@@ -1,28 +1,19 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
       datasource:
-        jdbcUrl: jdbc:postgresql://localhost:5432/crss_nmms
-        username: postgres
-        password: postgres
-        driverClassName: org.postgresql.Driver
+        driverClassName: com.edb.Driver
         maxPoolSize: 2
         test-on-borrow: true
         validation-query: SELECT 1
@@ -49,9 +40,6 @@ spring:
       jcache:
         config: ehcache3.xml
 
-  redis:
-    host: localhost
-    port: 6379
 
 logging:
   level:

crss-mq-computation/crss-mq-computation-dev.yml

@@ -1,33 +1,22 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
-      username: admin
-      password: password
-  jpa:
-    show-sql: true
-    generate-ddl: true
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
 
 batch:
   partitionSize:
@@ -37,5 +26,9 @@ batch:
 
 sftp:
   credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+    username: pemc
+    password: 123qwe
+    host: pemc-storage.southeastasia.cloudapp.azure.com
+    port: 22
+    workingDirectory: /home/pemc/upload
+    privateKey:

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

@@ -4,30 +4,29 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
       username: crss_reg2
       password: crss_reg2
-  jpa:
-    # show-sql: true
-    generate-ddl: true
+      driverClassName: org.postgresql.Driver
 
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 1024
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
 
 batch:
   partitionSize:
@@ -35,7 +34,3 @@ batch:
     ssla: 5000
     report: 1
 
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/mq

crss-mq-computation/crss-mq-computation-devoracle.yml

@@ -1,24 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_dataflow
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_main
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  jpa:
-    show-sql: true
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        ddl-auto: update
-        hbm2ddl:
-          import_files:

crss-mq-computation/crss-mq-computation-pemc-uat-default.yml

@@ -1,25 +1,26 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=registration
       username: crss_registration
       password: crss_registration
-  jpa:
-    # show-sql: true
-    generate-ddl: true
+      driverClassName: org.postgresql.Driver
 
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
@@ -35,9 +36,4 @@ batch:
   partitionSize:
     mq: 10000
     ssla: 5000
-    report: 1
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/mq
+    report: 1

crss-mq-computation/crss-mq-computation-pemc-uat-sit.yml

@@ -4,27 +4,30 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      driverClassName: org.postgresql.Driver
   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
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-  jpa:
-    # show-sql: true
-    generate-ddl: true
+      driverClassName: org.postgresql.Driver
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 2048
+
   redis:
     database: 4
 
@@ -34,8 +37,3 @@ batch:
     mq: 10000
     ssla: 5000
     report: 1
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/mq

crss-mq-computation/crss-mq-computation-pemc-uat.yml

@@ -1,42 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-registration:
-    dataSource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
-  jpa:
-    # show-sql: true
-    generate-ddl: true
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 2048
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-
-batch:
-  maxWorkers: 20
-  partitionSize:
-    mq: 10000
-    ssla: 5000
-    report: 1
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/mq

crss-mq-computation/crss-mq-computation-qa.yml

@@ -4,22 +4,23 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
       username: admin
       password: password
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
+      driverClassName: org.postgresql.Driver
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
       username: admin
       password: password
-  jpa:
-    show-sql: true
-    generate-ddl: true
+      driverClassName: org.postgresql.Driver
 
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
@@ -27,9 +28,6 @@ spring:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 1024
 
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-
 batch:
   partitionSize:
     mq: 10000
@@ -38,5 +36,4 @@ batch:
 
 sftp:
   credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
     workingDirectory: /upload

crss-mq-computation/crss-mq-computation-qaoracle.yml

@@ -1,24 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_dataflow
-      password: crss_dataflow
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_metering
-      password: crss_metering
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  jpa:
-    show-sql: true
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        ddl-auto: update
-        hbm2ddl:
-          import_files:

crss-mq-computation/crss-mq-computation-top-sit.yml

@@ -14,11 +14,10 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
       username: crss_sit_registration
       password: 6UZU8ilC
-  jpa:
-    # show-sql: true
-    generate-ddl: true
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
@@ -26,15 +25,9 @@ spring:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 2048
 
-
 batch:
   maxWorkers: 20
   partitionSize:
     mq: 10000
     ssla: 5000
-    report: 1
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/mq
+    report: 1

crss-mq-computation/crss-mq-computation-top.yml

@@ -14,11 +14,10 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
-  jpa:
-    # show-sql: true
-    generate-ddl: true
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
@@ -35,8 +34,3 @@ batch:
     mq: 10000
     ssla: 5000
     report: 1
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/mq

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

@@ -1,31 +1,23 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
+
   jpa:
     show-sql: false
     generate-ddl: false
@@ -37,10 +29,12 @@ spring:
         ddl-auto: none
         hbm2ddl:
           auto: none
+
   cloud:
     task:
       initialize:
         enable: false
+
   batch:
     initializer:
       enabled: false
@@ -49,10 +43,6 @@ spring:
     jcache:
       config: ehcache3.xml
 
-  redis:
-    host: localhost
-    port: 6379
-
 logging:
   level:
     com.pemc: debug
@@ -73,9 +63,5 @@ mqreport:
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/upload
-    privateKey:
+    host: sftp.marathon.l4lb.thisdcos.directory
+    workingDirectory: /upload/mq

crss-mtr/crss-mtr-dev.yml

@@ -1,35 +1,28 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
-      username: admin
-      password: password
-  jpa:
-    show-sql: true
-    generate-ddl: true
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
 
 sftp:
   credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+    username: pemc
+    password: 123qwe
+    host: pemc-storage.southeastasia.cloudapp.azure.com
+    port: 22
+    workingDirectory: /home/pemc/upload
+    privateKey:

crss-mtr/crss-mtr-dev2.yml

@@ -4,36 +4,30 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
       username: crss_reg2
       password: crss_reg2
-  jpa:
-    show-sql: true
-    generate-ddl: true
+      driverClassName: org.postgresql.Driver
 
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+          memory: 3072
+          cpu: 2
 
 batch:
   # resourceLocation: ${resourceLocation} - property expansion defaulted in app's application.yml
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload

crss-mtr/crss-mtr-devoracle.yml

@@ -1,24 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_dataflow
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000`
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-      username: crss_meterprocess_main
-      password: crss
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  jpa:
-    show-sql: true
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        ddl-auto: update
-        hbm2ddl:
-          import_files:

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

@@ -4,36 +4,30 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+      driverClassName: org.postgresql.Driver
   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
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-  jpa:
-    show-sql: true
-    generate-ddl: true
+      driverClassName: org.postgresql.Driver
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 4096
+          memory: 8192
+          cpu: 2
 
   redis:
     database: 5
-
-batch:
-  partitionSize:
-    mtr: 1
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload

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

@@ -4,26 +4,23 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      maxPoolSize: 2
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      maxPoolSize: 2
+      driverClassName: org.postgresql.Driver
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      maxPoolSize: 2
-  jpa:
-    show-sql: false
-    properties:
-      hibernate:
-        generate_statistics: false
+      driverClassName: org.postgresql.Driver
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
@@ -31,21 +28,6 @@ spring:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 8192
           cpu: 2
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
 
   redis:
     database: 4
-
-batch:
-  partitionSize:
-    mtr: 1
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload

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

@@ -1,39 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-  crss-registration:
-    dataSource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
-  jpa:
-    show-sql: true
-    generate-ddl: true
-  profiles:
-    include: mesos
-  cloud:
-    deployer:
-      mesos:
-        chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 4096
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-
-batch:
-  partitionSize:
-    mtr: 1
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload

crss-mtr/crss-mtr-qa.yml

@@ -4,34 +4,28 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
       username: admin
       password: password
+      driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess
       username: admin
       password: password
+      driverClassName: org.postgresql.Driver
   crss-registration:
     dataSource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_reg
       username: admin
       password: password
-  jpa:
-    show-sql: true
-    generate-ddl: true
+      driverClassName: org.postgresql.Driver
 
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 1024
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
+          memory: 3072
+          cpu: 2
 
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload

crss-mtr/crss-mtr-qaoracle.yml

@@ -1,24 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_dataflow
-      password: crss_dataflow
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
-      username: crss_metering
-      password: crss_metering
-      driverClassName: oracle.jdbc.driver.OracleDriver
-      connectionTimeout: 10000
-  jpa:
-    show-sql: true
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        ddl-auto: update
-        hbm2ddl:
-          import_files:

crss-mtr/crss-mtr-top-sit.yml

@@ -14,23 +14,14 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
       username: crss_sit_registration
       password: 6UZU8ilC
-  jpa:
-    show-sql: true
-    generate-ddl: true
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 4096
-
-batch:
-  partitionSize:
-    mtr: 1
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+          memory: 8192
+          cpu: 2

crss-mtr/crss-mtr-top.yml

@@ -14,26 +14,14 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
-  jpa:
-    show-sql: true
-    generate-ddl: true
+
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 4096
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-
-batch:
-  partitionSize:
-    mtr: 1
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload
+          memory: 8192
+          cpu: 2

crss-mtr/crss-mtr.yml

@@ -1,31 +1,23 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
       maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
+
   jpa:
     show-sql: false
     generate-ddl: false
@@ -37,18 +29,16 @@ spring:
         ddl-auto: none
         hbm2ddl:
           auto: none
+
   cloud:
     task:
       initialize:
         enable: false
+
   batch:
     initializer:
       enabled: false
 
-  redis:
-    host: localhost
-    port: 6379
-
 logging:
   level:
     com.pemc: debug
@@ -66,9 +56,6 @@ mtr:
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/upload
-    privateKey:
+    host: sftp.marathon.l4lb.thisdcos.directory
+    workingDirectory: /upload
+

crss-settlement-app/crss-settlement-app-dev-reg.yml

@@ -1,17 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/reg_crss_settlements
-      username: admin
-      password: password
-
-server:
-  port: 8082
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/stl

crss-settlement-app/crss-settlement-app-dev.yml

@@ -1,17 +1,19 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_settlement
-      username: admin
-      password: password
-
-server:
-  port: 8082
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_settlement
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
 
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://localhost:9393
 
 sftp:
   credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/stl
+    username: pemc
+    password: 123qwe
+    host: pemc-storage.southeastasia.cloudapp.azure.com
+    port: 22
+    workingDirectory: /home/pemc/stl/upload
+    privateKey:

crss-settlement-app/crss-settlement-app-dev2.yml

@@ -4,14 +4,4 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
       username: crss_settlement
       password: crss_settlement
-
-server:
-  port: 8082
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/stl
+      driverClassName: org.postgresql.Driver

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

@@ -1,17 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/bcq_crss_settlement
-      username: bcq_crss_settlement
-      password: bcq_crss_settlement
-
-server:
-  port: 8082
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/stl

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

@@ -4,17 +4,10 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
+      driverClassName: org.postgresql.Driver
 
   redis:
     database: 5
 
-server:
-  port: 8082
-
 dataflow:
   url: http://crss-uat-defaultspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/stl

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

@@ -4,18 +4,11 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
+      driverClassName: org.postgresql.Driver
 
   redis:
     database: 4
 
-
-server:
-  port: 8082
-
 dataflow:
   url: http://crss-uat-sitspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/stl

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

@@ -1,16 +0,0 @@
-spring:
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_settlement
-      username: crss_settlement
-      password: crss_settlement
-server:
-  port: 8082
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/stl

crss-settlement-app/crss-settlement-app-qa.yml

@@ -4,14 +4,4 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_settlement
       username: admin
       password: password
-
-server:
-  port: 8082
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/stl
+      driverClassName: org.postgresql.Driver

crss-settlement-app/crss-settlement-app-top-sit.yml

@@ -3,20 +3,4 @@ spring:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement
       username: crss_sit_settlement
-      password: FEeHqREu
-      platform: postgres
-      driverClassName: ${spring.datasource.driverClassName}
-
-  jpa:
-    generate-ddl: false
-
-server:
-  port: 8082
-
-dataflow:
-  url: http://crss-top-sitspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/stl
+      password: FEeHqREu

crss-settlement-app/crss-settlement-app-top.yml

@@ -3,20 +3,4 @@ spring:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=settlement
       username: crss_settlement
-      password: i17SMOPm
-      platform: postgres
-      driverClassName: ${spring.datasource.driverClassName}
-
-  jpa:
-    generate-ddl: false
-
-server:
-  port: 8082
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload/stl
+      password: i17SMOPm

crss-settlement-app/crss-settlement-app.yml

@@ -1,19 +1,17 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_settlement
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
+      driverClassName: com.edb.Driver
+      maxPoolSize: 2
       test-on-borrow: true
       validation-query: SELECT 1
+
   jpa:
     show-sql: false
     generate-ddl: true
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        dialect: org.hibernate.dialect.PostgreSQLDialect
         ddl-auto: validate
         hbm2ddl:
           import_files:
@@ -23,9 +21,6 @@ spring:
     job:
       enabled: false
 
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
-
 server:
   port: 9093
   undertow:
@@ -37,18 +32,6 @@ 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
 
 logging:
   level:
@@ -58,7 +41,12 @@ logging:
     org.apache.http: DEBUG
 
 dataflow:
-  url: http://localhost:9393
+  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+
+sftp:
+  credentials:
+    host: sftp.marathon.l4lb.thisdcos.directory
+    workingDirectory: /upload/stl
 
 job:
   maxRun: 1
@@ -67,11 +55,3 @@ report:
   directory:
     base: report/
 
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/stl/upload
-    privateKey: