refactored configs

crss-audit/application-azure.yml

@@ -1,37 +0,0 @@
-spring:
-  crss-audit:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=audit
-      username: crss_audit
-      password: crss_audit
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    open-in-view: false
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-server:
-  port: 9094
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-    compression:
-      enabled: true
-      min-response-size: 1
-
-logging:
-  level:
-    com.pemc: debug

crss-audit/application-dev2.yml

@@ -1,45 +0,0 @@
-spring:
-  crss-audit:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_audit
-      username: crss_audit
-      password: crss_audit
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    open-in-view: false
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-server:
-  port: 9094
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-    compression:
-      enabled: true
-      min-response-size: 1
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
-    resource:
-      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
-
-logging:
-  level:
-    com.pemc: debug

crss-audit/application-devlocal.yml

@@ -1,37 +0,0 @@
-spring:
-  crss-audit:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_audit
-      username: crss_audit
-      password: crss_audit
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    open-in-view: false
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
-  redis:
-    host: localhost
-    port: 6379
-
-server:
-  port: 9094
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-    compression:
-      enabled: true
-      min-response-size: 1
-
-logging:
-  level:
-    com.pemc: debug

crss-audit/application-pemc-uat.yml

@@ -1,45 +0,0 @@
-spring:
-  crss-audit:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_audit
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    open-in-view: false
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-server:
-  port: 9094
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-    compression:
-      enabled: true
-      min-response-size: 1
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
-    resource:
-      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
-
-logging:
-  level:
-    com.pemc: debug

crss-audit/application-pemc-uat2.yml

@@ -1,45 +0,0 @@
-spring:
-  crss-audit:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_audit
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    open-in-view: false
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-server:
-  port: 9094
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-    compression:
-      enabled: true
-      min-response-size: 1
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
-    resource:
-      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
-
-logging:
-  level:
-    com.pemc: debug

crss-audit/crss-audit-azure.yml

@@ -0,0 +1,9 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=audit
+      username: crss_audit
+      password: crss_audit
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory

crss-audit/crss-audit-dev2.yml

@@ -0,0 +1,16 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_audit
+      username: crss_audit
+      password: crss_audit
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+
+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-pemc-uat.yml

@@ -0,0 +1,14 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_audit
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+
+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-pemc-uat2.yml

@@ -0,0 +1,14 @@
+spring:
+  crss-audit:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_audit
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+
+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-dataflow-app/application-azure.yml

@@ -1,66 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    show-sql: true
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          auto: none
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
-
-server:
-  port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
-
-# temporary todi-config, to be moved to general config
-todi-config:
-  dispatch-interval: 5
-  max-retry: 2

crss-dataflow-app/application-dev.yml

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

crss-dataflow-app/application-dev2.yml

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

crss-dataflow-app/application-devlocal.yml

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

crss-dataflow-app/application-top.yml

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

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

@@ -0,0 +1,27 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+  jpa:
+    show-sql: true
+    generate-ddl: true
+    properties:
+      hibernate:
+        hbm2ddl:
+          auto: none
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+
+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

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

@@ -0,0 +1,26 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
+      username: admin
+      password: password
+  jpa:
+    show-sql: true
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+
+server:
+  port: 8082
+
+dataflow:
+  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+
+security:
+  basic:
+    enabled: false
+  ignored: /**
+
+management:
+  security:
+    enabled: false

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

@@ -0,0 +1,25 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+  jpa:
+    show-sql: true
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+
+server:
+  port: 8082
+
+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

crss-dataflow-app/application-pemc-uat.yml → crss-dataflow-app/crss-dataflow-app-pemc-uat.yml

@@ -4,43 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
         hbm2ddl:
           auto: none
 
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
 security:
   oauth2:
@@ -50,25 +26,10 @@ security:
     resource:
       userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
 
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
-
-# temporary todi-config, to be moved to general config
-todi-config:
-  dispatch-interval: 5
-  max-retry: 2
+    workingDirectory: /upload

crss-dataflow-app/application-pemc-uat2.yml → crss-dataflow-app/crss-dataflow-app-pemc-uat2.yml

@@ -4,43 +4,19 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow2
       username: crss_dataflow2
       password: crss_dataflow2
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 20
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
     generate-ddl: true
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
         hbm2ddl:
           auto: none
 
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
 security:
   oauth2:
@@ -50,25 +26,10 @@ security:
     resource:
       userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
 
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-
 dataflow:
   url: http://spring-cloud-data-flow2.marathon.l4lb.thisdcos.directory:9393
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:
-
-# temporary todi-config, to be moved to general config
-todi-config:
-  dispatch-interval: 5
-  max-retry: 2
+    workingDirectory: /upload

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

@@ -0,0 +1,24 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+  jpa:
+    show-sql: true
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+
+server:
+  port: 8082
+
+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

crss-dataflow-app/application.yml → crss-dataflow-app/crss-dataflow-app.yml

@@ -28,8 +28,8 @@ spring:
       enabled: false
 
   redis:
-      host: localhost
-      port: 6379
+    host: localhost
+    port: 6379
 
 #liquibase:
 #  change-log: classpath:/db/db.changelog-master.xml

crss-datainterface-task-ingest/application-azure.yml

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

crss-datainterface-task-ingest/application-dev.yml

@@ -1,101 +0,0 @@
-spring:
-  crss-emdb:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@13.76.188.39:1521:ORCL
-      username: pemc
-      password: 123qwe
-      driverClassName: oracle.jdbc.OracleDriver
-      maxPoolSize: 5
-      #test-on-borrow: true
-      #validation-query: SELECT 1
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-nmms:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/todi_crss_nmms
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/todi_crss_reg
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        generate_statistics: true
-  cloud:
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
-    org.hibernate.stat: debug
-
-batch:
-  # resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
-  partitionSize:
-    mq: 1500
-    ssla: 1500
-    report: 1500
-    importPrices: 100
-  autoMinusDaysAgo: 2
-
-mqreport:
-  directory: /tmp/
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/sow7
-    privateKey:
-
-database:
-  emdb:
-    rtu-db: "TEMP_SNAPSHOT_DATA"
-    energy-price-sched-db: "TEMP_MOAR_MVIEW"
-    reserve-price-sched-db: "TEMP_RESERVED_MOAR_MVIEW"
-  nmms:
-    rtu-db: "TXN_RTU"
-    energy-price-sched-db: "TXN_ENERGY_PRICE_SCHED"
-    reserve-price-sched-db: "TXN_RESERVE_PRICE_SCHED"
-    reserve-bcq-db: "TXN_RESERVE_BCQ"
-
-bcq:
-  fileNamePrefix: "reserve_bcq_"
-
-todi_config:
-  dispatch-interval: 5
-
-reserve-categories-white-list: "Regulation Down,Fast Contingency Raise,Fast Contingency Lower,Slow Contingency Raise,Slow Contingency Lower,Delayed Contingency Raise,Delayed Contingency Lower,Regulation Up"

crss-datainterface-task-ingest/application-dev2.yml

@@ -1,110 +0,0 @@
-spring:
-  crss-emdb:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@13.76.188.39:1521:ORCL
-      username: pemc
-      password: 123qwe
-      driverClassName: oracle.jdbc.OracleDriver
-      maxPoolSize: 5
-      #test-on-borrow: true
-      #validation-query: SELECT 1
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-nmms:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_nmms
-      username: crss_nmms
-      password: crss_nmms
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-registration:
-      datasource:
-        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
-        username: crss_reg
-        password: crss_reg
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
-  crss-settlements:
-      datasource:
-        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
-        username: crss_settlement
-        password: crss_settlement
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        generate_statistics: true
-  cloud:
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
-    org.hibernate.stat: debug
-
-batch:
-  #resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
-  partitionSize:
-    mq: 1500
-    ssla: 1500
-    report: 1500
-    importPrices: 100
-  autoMinusDaysAgo: 2
-
-mqreport:
-  directory: /tmp/
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/sow7
-    privateKey:
-
-database:
-  emdb:
-    rtu-db: "TEMP_SNAPSHOT_DATA"
-    energy-price-sched-db: "TEMP_MOAR_MVIEW"
-    reserve-price-sched-db: "TEMP_RESERVED_MOAR_MVIEW"
-  nmms:
-    rtu-db: "TXN_RTU"
-    energy-price-sched-db: "TXN_ENERGY_PRICE_SCHED"
-    reserve-price-sched-db: "TXN_RESERVE_PRICE_SCHED"
-    reserve-bcq-db: "TXN_RESERVE_BCQ"
-
-bcq:
-  fileNamePrefix: "reserve_bcq_"
-
-todi_config:
-  dispatch-interval: 5
-
-reserve-categories-white-list: "Regulation Down,Fast Contingency Raise,Fast Contingency Lower,Slow Contingency Raise,Slow Contingency Lower,Delayed Contingency Raise,Delayed Contingency Lower,Regulation Up"

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

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

crss-datainterface-task-ingest/application-top.yml

@@ -1,105 +0,0 @@
-spring:
-  crss-emdb:
-    datasource:
-      jdbcUrl: jdbc:oracle:thin:@13.76.188.39:1521:ORCL
-      username: pemc
-      password: 123qwe
-      driverClassName: oracle.jdbc.OracleDriver
-      maxPoolSize: 5
-      #test-on-borrow: true
-      #validation-query: SELECT 1
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-nmms:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=nmms
-      username: crss_meterprocess
-      password: crss_meterprocess
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-registration:
-      datasource:
-        jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
-        username: crss_reg
-        password: B3XxYcAb
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
-  crss-settlements:
-      datasource:
-        jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=settlement
-        username: crss_settlement
-        password: crss_settlement
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        ddl-auto: none
-        generate_statistics: true
-  cloud:
-    task:
-      initialize:
-        enable: false
-  batch:
-    initializer:
-      enabled: false
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-logging:
-  level:
-    com.pemc: debug
-    org.hibernate.stat: debug
-
-batch:
-  #resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"
-  partitionSize:
-    mq: 1500
-    ssla: 1500
-    report: 1500
-    importPrices: 100
-  autoMinusDaysAgo: 2
-
-mqreport:
-  directory: /tmp/
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/sow7
-    privateKey:
-
-database:
-  emdb:
-    rtu-db: "TEMP_SNAPSHOT_DATA"
-    energy-price-sched-db: "TEMP_MOAR_MVIEW"
-    reserve-price-sched-db: "TEMP_RESERVED_MOAR_MVIEW"
-  nmms:
-    rtu-db: "TXN_RTU"
-    energy-price-sched-db: "TXN_ENERGY_PRICE_SCHED"
-    reserve-price-sched-db: "TXN_RESERVE_PRICE_SCHED"
-    reserve-bcq-db: "TXN_RESERVE_BCQ"
-
-bcq:
-  fileNamePrefix: "reserve_bcq_"
-
-todi_config:
-  dispatch-interval: 5
-
-reserve-categories-white-list: "Regulation Down,Fast Contingency Raise,Fast Contingency Lower,Slow Contingency Raise,Slow Contingency Lower,Delayed Contingency Raise,Delayed Contingency Lower,Regulation Up"

crss-datainterface-task-ingest/crss-datainterface-task-ingest-azure.yml

@@ -0,0 +1,29 @@
+spring:
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmms
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+  jpa:
+    show-sql: true
+    properties:
+      hibernate:
+        #generate_statistics: true
+        hbm2ddl:
+          auto: none
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+
+batch:
+  #resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"

crss-datainterface-task-ingest/crss-datainterface-task-ingest-dev.yml

@@ -0,0 +1,27 @@
+spring:
+  crss-emdb:
+    datasource:
+      maxPoolSize: 5
+      #test-on-borrow: true
+      #validation-query: SELECT 1
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
+      username: admin
+      password: password
+      test-on-borrow: true
+      validation-query: SELECT 1
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/todi_crss_nmms
+      username: admin
+      password: password
+      test-on-borrow: true
+      validation-query: SELECT 1
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/todi_crss_reg
+      username: admin
+      password: password
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory

crss-datainterface-task-ingest/crss-datainterface-task-ingest-dev2.yml

@@ -0,0 +1,41 @@
+spring:
+  crss-emdb:
+    datasource:
+      maxPoolSize: 5
+      #test-on-borrow: true
+      #validation-query: SELECT 1
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      test-on-borrow: true
+      validation-query: SELECT 1
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_nmms
+      username: crss_nmms
+      password: crss_nmms
+      test-on-borrow: true
+      validation-query: SELECT 1
+  crss-registration:
+      datasource:
+        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
+        username: crss_reg
+        password: crss_reg
+        driverClassName: org.postgresql.Driver
+        maxPoolSize: 5
+        test-on-borrow: true
+        validation-query: SELECT 1
+  crss-settlements:
+      datasource:
+        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
+        username: crss_settlement
+        password: crss_settlement
+        driverClassName: org.postgresql.Driver
+        maxPoolSize: 5
+        test-on-borrow: true
+        validation-query: SELECT 1
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory

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

@@ -0,0 +1,34 @@
+spring:
+  crss-emdb:
+    datasource:
+      jdbcUrl: jdbc:oracle:thin:@10.176.23.24:1521:ORCL
+      username: emdb
+      password: emdb
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/todi_crss_nmms
+      username: todi_crss_nmms
+      password: todi_crss_nmms
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/todi_crss_reg
+      username: todi_crss_reg
+      password: todi_crss_reg
+  jpa:
+    show-sql: true
+    properties:
+      hibernate:
+        #generate_statistics: true
+        hbm2ddl:
+          auto: none
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+
+batch:
+  #resourceLocation: "file:target/libs/crss-datainterface-task-ingest-1.0.0.BUILD-SNAPSHOT.jar"

crss-datainterface-task-ingest/crss-datainterface-task-ingest-top.yml

@@ -0,0 +1,39 @@
+spring:
+  crss-emdb:
+    datasource:
+      maxPoolSize: 5
+      #test-on-borrow: true
+      #validation-query: SELECT 1
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      test-on-borrow: true
+      validation-query: SELECT 1
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=nmms
+      username: crss_meterprocess
+      password: crss_meterprocess
+      test-on-borrow: true
+      validation-query: SELECT 1
+  crss-registration:
+      datasource:
+        jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
+        username: crss_reg
+        password: B3XxYcAb
+        maxPoolSize: 5
+        test-on-borrow: true
+        validation-query: SELECT 1
+  crss-settlements:
+      datasource:
+        jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=settlement
+        username: crss_settlement
+        password: crss_settlement
+        maxPoolSize: 5
+        test-on-borrow: true
+        validation-query: SELECT 1
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+

crss-datainterface-task-ingest/application.yml → crss-datainterface-task-ingest/crss-datainterface-task-ingest.yml

@@ -45,6 +45,9 @@ spring:
   batch:
     initializer:
       enabled: false
+  redis:
+    host: localhost
+    port: 6379
 
 logging:
   level:

crss-meterprocess-app/application-azure.yml

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

crss-meterprocess-app/application-dev.yml

@@ -1,100 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-nmms:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_nmms
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
-
-server:
-  port: 8081
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.hibernate.stat: debug
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-job:
-  maxRun: 1
-
-security:
-  ignored: /**
-
-management:
-  security:
-    enabled: false
-
-sftp:
-  credentials:
-    username: pemc
-    password: 123qwe
-    host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
-    workingDirectory: /upload
-    privateKey:

crss-meterprocess-app/application-dev2.yml

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

crss-meterprocess-app/application-devoracle.yml

@@ -1,65 +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:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
-
-  jpa:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        ddl-auto: update
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
-
-server:
-  port: 8081
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG

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

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

crss-meterprocess-app/application-pemc-uat2.yml

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

crss-meterprocess-app/application-qaoracle.yml

@@ -1,68 +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:
-    show-sql: false
-    generate-ddl: true
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        ddl-auto: update
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
-
-server:
-  port: 8081
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG

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

@@ -0,0 +1,30 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmms
+
+  jpa:
+    generate-ddl: true
+
+server:
+  port: 8081
+
+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-dev.yml

@@ -0,0 +1,37 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
+      username: admin
+      password: password
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
+      username: admin
+      password: password
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_nmms
+      username: admin
+      password: password
+
+  jpa:
+    generate-ddl: true
+
+server:
+  port: 8081
+
+dataflow:
+  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+
+security:
+  ignored: /**
+
+management:
+  security:
+    enabled: false
+
+sftp:
+  credentials:
+    host: sftp.marathon.l4lb.thisdcos.directory
+    workingDirectory: /upload

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

@@ -0,0 +1,38 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess`
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
+      username: crss_reg
+      password: crss_reg
+  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

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

@@ -0,0 +1,23 @@
+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.yml

@@ -0,0 +1,38 @@
+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_meterprocess
+      password: crss_meterprocess
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_nmms
+      username: crss_meterprocess
+      password: crss_meterprocess
+
+  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-pemc-uat2.yml

@@ -0,0 +1,38 @@
+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_meterprocess
+      password: crss_meterprocess
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_nmms
+      username: crss_meterprocess
+      password: crss_meterprocess
+
+  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-flow2.marathon.l4lb.thisdcos.directory:9393
+
+sftp:
+  credentials:
+    host: sftp.marathon.l4lb.thisdcos.directory
+    workingDirectory: /upload

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

@@ -0,0 +1,29 @@
+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/application-top.yml → crss-meterprocess-app/crss-meterprocess-app-top.yml

@@ -4,54 +4,22 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
       username: crss_reg
       password: B3XxYcAb
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-nmms:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=nmms
       username: crss_meterprocess
       password: crss_meterprocess
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-    show-sql: false
     generate-ddl: true
-    properties:
-      hibernate:
-        generate_statistics: true
-        ddl-auto: none
-        hbm2ddl:
-          import_files:
-
-  # prevent batch job from running on app start
-  batch:
-    job:
-      enabled: false
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
 
 server:
   port: 8081
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
 
 security:
   oauth2:
@@ -64,14 +32,7 @@ security:
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
-job:
-  maxRun: 1
-
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
     workingDirectory: /upload
-    privateKey:

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

@@ -1,43 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
-      username: crss_metering
-      password: crss_metering
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
-      username: crss_registration
-      password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
-logging:
-  level:
-    com.pemc: debug

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

@@ -1,43 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_metering
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
-logging:
-  level:
-    com.pemc: debug

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

@@ -1,43 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_metering
-      username: crss_metering
-      password: crss_metering
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
-      username: crss_reg
-      password: crss_reg
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
-logging:
-  level:
-    com.pemc: debug

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

@@ -1,43 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
-logging:
-  level:
-    com.pemc: debug

crss-meterprocess-stream-daily-sink/application-pemc-uat2.yml

@@ -1,43 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
-      username: crss_meterprocess
-      password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
-logging:
-  level:
-    com.pemc: debug

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

@@ -1,36 +0,0 @@
-spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-metering:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
-      username: crss_metering
-      password: Fh7UcXpW
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-registration:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
-      username: crss_reg
-      password: B3XxYcAb
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false

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

@@ -0,0 +1,16 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration

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

@@ -0,0 +1,16 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
+      username: admin
+      password: password
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_metering
+      username: admin
+      password: password
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
+      username: admin
+      password: password

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

@@ -0,0 +1,16 @@
+spring:
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_metering
+      username: crss_metering
+      password: crss_metering
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
+      username: crss_reg
+      password: crss_reg

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

@@ -6,7 +6,6 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-metering:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
@@ -14,7 +13,6 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-registration:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
@@ -22,19 +20,7 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: none
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-        hbm2ddl:
-          auto: none
-        temp:
-          use_jdbc_metadata_defaults: false
-logging:
-  level:
-    com.pemc: debug
+        dialect: org.hibernate.dialect.Oracle10gDialect

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

@@ -0,0 +1,16 @@
+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_meterprocess
+      password: crss_meterprocess
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
+      username: crss_meterprocess
+      password: crss_meterprocess

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

@@ -0,0 +1,16 @@
+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_meterprocess
+      password: crss_meterprocess
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
+      username: crss_meterprocess
+      password: crss_meterprocess

crss-meterprocess-stream-processor-daily-validate/application-qaoracle.yml → crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-qaoracle.yml

@@ -6,7 +6,6 @@ spring:
       password: crss_meterprocess
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-metering:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
@@ -14,7 +13,6 @@ spring:
       password: crss_metering
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-registration:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
@@ -22,9 +20,8 @@ spring:
       password: crss_reg
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   jpa:
-    show-sql: false
-logging:
-  level:
-    com.pemc: debug
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.Oracle10gDialect
+

crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-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: crss_meterprocess
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
+      username: crss_metering
+      password: Fh7UcXpW
+  crss-registration:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
+      username: crss_reg
+      password: B3XxYcAb

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

@@ -28,6 +28,16 @@ spring:
       validation-query: SELECT 1
   jpa:
     show-sql: false
+    hibernate:
+      ddl-auto: none
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
+        hbm2ddl:
+          auto: none
+        temp:
+          use_jdbc_metadata_defaults: false
 logging:
   level:
     com.pemc: debug

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

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

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

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

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

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

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

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

crss-meterprocess-stream-mapper/application-pemc-uat2.yml

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

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

@@ -1,37 +0,0 @@
-spring:
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-  crss-registration:
-    dataSource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
-      username: crss_reg
-      password: B3XxYcAb
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379

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

@@ -0,0 +1,21 @@
+spring:
+  crss-registration:
+    dataSource:
+      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=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-dev.yml

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

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

@@ -0,0 +1,19 @@
+spring:
+  crss-registration:
+    dataSource:
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
+      username: crss_reg
+      password: crss_reg
+  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

crss-meterprocess-stream-processor-daily-validate/application-devoracle.yml → crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-devoracle.yml

@@ -6,7 +6,6 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-metering:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
@@ -23,13 +22,13 @@ spring:
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
       maxPoolSize: 5
+
   jpa:
-    show-sql: false
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.Oracle10gDialect
+        hbm2ddl:
+          auto: none
 logging:
   level:
-    com.pemc: debug
+    com.pemc: debug

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

@@ -0,0 +1,20 @@
+spring:
+  crss-registration:
+    dataSource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
+      username: crss_meterprocess
+      password: crss_meterprocess
+  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-pemc-uat2.yml

@@ -0,0 +1,20 @@
+spring:
+  crss-registration:
+    dataSource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
+      username: crss_meterprocess
+      password: crss_meterprocess
+  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/application-qaoracle.yml → crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-qaoracle.yml

@@ -1,9 +1,4 @@
 spring:
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
   crss-registration:
       dataSource:
         jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
@@ -22,18 +17,8 @@ spring:
         maxPoolSize: 5
 
   jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: none
     properties:
       hibernate:
         dialect: org.hibernate.dialect.Oracle10gDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
         hbm2ddl:
-          auto: none
-        temp:
-          use_jdbc_metadata_defaults: false
-
-logging:
-  level:
-    com.pemc: debug
+          auto: none

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

@@ -0,0 +1,19 @@
+spring:
+  crss-registration:
+    dataSource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
+      username: crss_reg
+      password: B3XxYcAb
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+
+  jpa:
+    properties:
+      hibernate:
+        hbm2ddl:
+          auto: none
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory

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

@@ -24,15 +24,19 @@ spring:
       validation-query: SELECT 1
 
   jpa:
-      show-sql: false
+    show-sql: false
+    hibernate:
+      ddl-auto: none
+    properties:
       hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          temp:
-            use_jdbc_metadata_defaults: false
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
+        temp:
+          use_jdbc_metadata_defaults: false
+  redis:
+    host: localhost
+    port: 6379
+
 
 logging:
   level:

crss-meterprocess-stream-processor-daily-validate/application-azure.yml → crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-azure.yml

@@ -4,31 +4,18 @@ spring:
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
       username: crss_metering
       password: crss_metering
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-    show-sql: false
     hibernate:
       ddl-auto: none
     properties:
@@ -38,14 +25,4 @@ spring:
         hbm2ddl:
           auto: none
         temp:
-          use_jdbc_metadata_defaults: false
-
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-
-logging:
-  level:
-    com.pemc: debug
+          use_jdbc_metadata_defaults: false

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

@@ -4,31 +4,18 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_metering
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
       username: admin
       password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-    show-sql: false
     hibernate:
       ddl-auto: none
     properties:
@@ -38,14 +25,4 @@ spring:
         hbm2ddl:
           auto: none
         temp:
-          use_jdbc_metadata_defaults: false
-
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-
-logging:
-  level:
-    com.pemc: debug
+          use_jdbc_metadata_defaults: false

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

@@ -4,31 +4,18 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_metering
       username: crss_metering
       password: crss_metering
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg
       username: crss_reg
       password: crss_reg
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-    show-sql: false
     hibernate:
       ddl-auto: none
     properties:
@@ -38,14 +25,4 @@ spring:
         hbm2ddl:
           auto: none
         temp:
-          use_jdbc_metadata_defaults: false
-
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-
-logging:
-  level:
-    com.pemc: debug
+          use_jdbc_metadata_defaults: false

crss-meterprocess-stream-mapper/application-devoracle.yml → crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-devoracle.yml

@@ -6,7 +6,6 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-metering:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
@@ -14,29 +13,10 @@ spring:
       password: crss
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   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
-      maxPoolSize: 5
-
-  jpa:
-      show-sql: false
-      hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.Oracle10gDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
-
-logging:
-  level:
-    com.pemc: debug
+      connectionTimeout: 10000

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

@@ -4,31 +4,18 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_metering2
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-    show-sql: false
     hibernate:
       ddl-auto: none
     properties:
@@ -38,14 +25,4 @@ spring:
         hbm2ddl:
           auto: none
         temp:
-          use_jdbc_metadata_defaults: false
-
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-
-logging:
-  level:
-    com.pemc: debug
+          use_jdbc_metadata_defaults: false

crss-meterprocess-stream-processor-daily-validate/application-pemc-uat2.yml → crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-pemc-uat2.yml

@@ -4,31 +4,18 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_metering2
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_reg2
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-    show-sql: false
     hibernate:
       ddl-auto: none
     properties:
@@ -38,14 +25,4 @@ spring:
         hbm2ddl:
           auto: none
         temp:
-          use_jdbc_metadata_defaults: false
-
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-
-logging:
-  level:
-    com.pemc: debug
+          use_jdbc_metadata_defaults: false

crss-meterprocess-stream-daily-sink/application-qaoracle.yml → crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-qaoracle.yml

@@ -6,7 +6,6 @@ spring:
       password: crss_meterprocess
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   crss-metering:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@10.64.0.4:1521:XE
@@ -14,27 +13,10 @@ spring:
       password: crss_metering
       driverClassName: oracle.jdbc.driver.OracleDriver
       connectionTimeout: 10000
-      maxPoolSize: 5
   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
-      maxPoolSize: 5
-  jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: none
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-        hbm2ddl:
-          auto: none
-        temp:
-          use_jdbc_metadata_defaults: false
-logging:
-  level:
-    com.pemc: debug
+      connectionTimeout: 10000

crss-meterprocess-stream-processor-daily-validate/application-top.yml → crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-top.yml

@@ -4,28 +4,18 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-metering:
     datasource:
       jdbcUrl: jjdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-registration:
     datasource:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=registration
       username: crss_reg
       password: B3XxYcAb
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
 
   jpa:
-    show-sql: false
     hibernate:
       ddl-auto: none
     properties:
@@ -35,9 +25,3 @@ spring:
           auto: none
         temp:
           use_jdbc_metadata_defaults: false
-
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json

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

@@ -1,86 +0,0 @@
-#daily extract
-spring:
-  profiles: dailyExtract
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_metering
-    username: crss_metering
-    url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-#Monthly extract
-spring:
-  profiles: monthlyExtract
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_metering
-    username: crss_metering
-    url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-# default
-spring:
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_metering
-    username: crss_metering
-    url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG

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

@@ -1,86 +0,0 @@
-#daily extract
-spring:
-  profiles: dailyExtract
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: password
-    username: admin
-    url: jdbc:postgresql://192.168.236.2:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-#Monthly extract
-spring:
-  profiles: monthlyExtract
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: password
-    username: admin
-    url: jdbc:postgresql://192.168.236.2:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-# default
-spring:
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: password
-    username: admin
-    url: jdbc:postgresql://192.168.236.2:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG

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

@@ -1,86 +0,0 @@
-#daily extract
-spring:
-  profiles: dailyExtract
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_metering
-    username: crss_metering
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-#Monthly extract
-spring:
-  profiles: monthlyExtract
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_metering
-    username: crss_metering
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-# default
-spring:
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_metering
-    username: crss_metering
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG

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

@@ -1,86 +0,0 @@
-#daily extract
-spring:
-  profiles: dailyExtract
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_meterprocess
-    username: crss_meterprocess
-    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-#Monthly extract
-spring:
-  profiles: monthlyExtract
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_meterprocess
-    username: crss_meterprocess
-    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-# default
-spring:
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_meterprocess
-    username: crss_meterprocess
-    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG

crss-meterprocess-stream-source-daily-raw/application-pemc-uat2.yml

@@ -1,86 +0,0 @@
-#daily extract
-spring:
-  profiles: dailyExtract
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_meterprocess
-    username: crss_meterprocess
-    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-#Monthly extract
-spring:
-  profiles: monthlyExtract
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_meterprocess
-    username: crss_meterprocess
-    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-# default
-spring:
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    password: crss_meterprocess
-    username: crss_meterprocess
-    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG

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

@@ -1,79 +0,0 @@
-#daily extract
-spring:
-  profiles: dailyExtract
-  datasource:
-    url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
-    username: crss_meterprocess
-    password: Fh7UcXpW
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_daily where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_daily set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-#Monthly extract
-spring:
-  profiles: monthlyExtract
-  datasource:
-    url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
-    username: crss_meterprocess
-    password: Fh7UcXpW
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS
-
-logging:
-  level:
-    com.pemc: DEBUG
-
----
-
-# default
-spring:
-  datasource:
-    url: jdbc:edb://10.176.11.23:5432/crss?currentSchema=metering
-    username: crss_meterprocess
-    password: Fh7UcXpW
-    maxPoolSize: 5
-    test-on-borrow: true
-    validation-query: SELECT 1
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
-jdbc:
-  query: "select * from txn_meter_data_monthly where consumed <> TRUE or consumed is null limit 10000;"
-  update: "update txn_meter_data_monthly set consumed = TRUE where meter_data_id in (:meter_data_id);"
-
-trigger:
-  fixed-delay: 5
-  time-unit: SECONDS

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

@@ -0,0 +1,38 @@
+#daily extract
+spring:
+  profiles: dailyExtract
+  datasource:
+    password: crss_metering
+    username: crss_metering
+    url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
+
+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);"
+
+---
+
+#Monthly extract
+spring:
+  profiles: monthlyExtract
+  datasource:
+    password: crss_metering
+    username: crss_metering
+    url: jdbc:postgresql://10.64.0.4:5432/crss?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);"
+
+---
+
+# default
+spring:
+  datasource:
+    password: crss_metering
+    username: crss_metering
+    url: jdbc:postgresql://10.64.0.4:5432/crss?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);"

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

@@ -0,0 +1,29 @@
+#daily extract
+spring:
+  profiles: dailyExtract
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    password: password
+    username: admin
+    url: jdbc:postgresql://192.168.236.2:5432/crss_metering
+
+---
+
+#Monthly extract
+spring:
+  profiles: monthlyExtract
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    password: password
+    username: admin
+    url: jdbc:postgresql://192.168.236.2:5432/crss_metering
+
+---
+
+# default
+spring:
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    password: password
+    username: admin
+    url: jdbc:postgresql://192.168.236.2:5432/crss_metering

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

@@ -0,0 +1,29 @@
+#daily extract
+spring:
+  profiles: dailyExtract
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    password: crss_metering
+    username: crss_metering
+    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
+
+---
+
+#Monthly extract
+spring:
+  profiles: monthlyExtract
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    password: crss_metering
+    username: crss_metering
+    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
+
+---
+
+# default
+spring:
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    password: crss_metering
+    username: crss_metering
+    url: jdbc:postgresql://192.168.233.9:5432/crss_metering

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

@@ -6,11 +6,6 @@ spring:
     password: crss
     username: crss_meterprocess_metering
     url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
 jdbc:
   max-rows-per-poll: 1
   query: "select * from txn_meter_data_daily where consumed <> 'Y' or consumed is null or consumed = ''"
@@ -40,11 +35,6 @@ spring:
     password: crss
     username: crss_meterprocess_metering
     url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
 jdbc:
   max-rows-per-poll: 1
   query: "select * from txn_meter_data_monthly where consumed <> 'Y' or consumed is null or consumed = ''"
@@ -68,11 +58,6 @@ spring:
     password: crss
     username: crss_meterprocess_metering
     url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-  cloud:
-    stream:
-      bindings:
-        output:
-          content-type: application/json
 jdbc:
   max-rows-per-poll: 1
   query: "select * from txn_meter_data_monthly where consumed <> 'Y' or consumed is null or consumed = ''"

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

@@ -0,0 +1,29 @@
+#daily extract
+spring:
+  profiles: dailyExtract
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    password: crss_meterprocess
+    username: crss_meterprocess
+    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
+
+---
+
+#Monthly extract
+spring:
+  profiles: monthlyExtract
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    password: crss_meterprocess
+    username: crss_meterprocess
+    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
+
+---
+
+# default
+spring:
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    password: crss_meterprocess
+    username: crss_meterprocess
+    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2

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

@@ -0,0 +1,29 @@
+#daily extract
+spring:
+  profiles: dailyExtract
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    password: crss_meterprocess
+    username: crss_meterprocess
+    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
+
+---
+
+#Monthly extract
+spring:
+  profiles: monthlyExtract
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    password: crss_meterprocess
+    username: crss_meterprocess
+    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2
+
+---
+
+# default
+spring:
+  datasource:
+    driver-class-name: org.postgresql.Driver
+    password: crss_meterprocess
+    username: crss_meterprocess
+    url: jdbc:postgresql://10.176.23.24:5432/crss_metering2