Update phase2 apps config based on master branch

crss-dataflow-app/application-dev.yml

@@ -1,44 +1,19 @@
 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-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
       username: admin
       password: password
       driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
+      connectionTimeout: 10000
+      maxPoolSize: 20
       test-on-borrow: true
       validation-query: SELECT 1
-  crss-nmms:
-      datasource:
-        jdbcUrl: jdbc:postgresql://192.168.236.2:5432/todi_crss_nmms
-        username: postgres
-        password: postgres
-        driverClassName: org.postgresql.Driver
-        connectionTimeout: 10000
-        maxPoolSize: 5
-  crss-stl:
-      datasource:
-        jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_settlement
-        username: postgres
-        password: postgres
-        driverClassName: org.postgresql.Driver
-        connectionTimeout: 10000
-        maxPoolSize: 5
   jpa:
     show-sql: true
     generate-ddl: false
     properties:
       hibernate:
-        generate_statistics: true
         dialect: org.hibernate.dialect.PostgreSQLDialect
         ddl-auto: none
         hbm2ddl:
@@ -86,8 +61,6 @@ logging:
     com.netflix: DEBUG
     org.springframework.cloud: DEBUG
     org.apache.http: DEBUG
-    org.hibernate.type: trace
-    org.hibernate.stat: debug
 
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
@@ -106,3 +79,12 @@ todi-config:
   dispatch-interval: 5
   max-retry: 2
 
+
+security:
+  basic:
+    enabled: false
+  ignored: /**
+
+management:
+  security:
+    enabled: false

crss-dataflow-app/application-dev2.yml

@@ -1,38 +1,14 @@
 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-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
+      maxPoolSize: 20
+      connectionTimeout: 10000
       test-on-borrow: true
       validation-query: SELECT 1
-  crss-nmms:
-      datasource:
-        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/todi_crss_nmms
-        username: todi_crss_nmms
-        password: todi_crss_nmms
-        driverClassName: org.postgresql.Driver
-        connectionTimeout: 10000
-        maxPoolSize: 5
-  crss-stl:
-      datasource:
-        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
-        username: crss_settlement
-        password: crss_settlement
-        driverClassName: org.postgresql.Driver
-        connectionTimeout: 10000
-        maxPoolSize: 5
   jpa:
     show-sql: true
     generate-ddl: false
@@ -67,18 +43,14 @@ server:
     enabled: true
     min-response-size: 1
 
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://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:

crss-dataflow-app/application-devlocal.yml

@@ -1,39 +1,14 @@
 spring:
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_settlement
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
+      maxPoolSize: 20
+      connectionTimeout: 10000
       test-on-borrow: true
       validation-query: SELECT 1
-  crss-nmms:
-      datasource:
-        jdbcUrl: jdbc:postgresql://localhost:5432/crss_nmms
-        username: postgres
-        password: postgres
-        driverClassName: org.postgresql.Driver
-        connectionTimeout: 10000
-        maxPoolSize: 5
   jpa:
     show-sql: false
     generate-ddl: true

crss-dataflow-app/application-qa.yml

@@ -5,57 +5,19 @@ spring:
       username: admin
       password: password
       driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory: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://postgresql.marathon.l4lb.thisdcos.directory: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://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_nmms
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
-  crss-stl:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_settlement
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      maxPoolSize: 20
       connectionTimeout: 10000
-      maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
-
   jpa:
-    show-sql: false
-    generate-ddl: false
+    show-sql: true
+    generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
         dialect: org.hibernate.dialect.PostgreSQLDialect
         ddl-auto: none
         hbm2ddl:
-          import_files:
+          auto: none
 
   # prevent batch job from running on app start
   batch:
@@ -80,25 +42,19 @@ server:
     enabled: true
     min-response-size: 1
 
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+    resource:
+      userInfoUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/user
 
 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

crss-dataflow-app/application.yml

@@ -1,12 +1,4 @@
 spring:
-  crss-main:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
   crss-dataflow:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
@@ -14,23 +6,9 @@ spring:
       password: postgres
       driverClassName: org.postgresql.Driver
       connectionTimeout: 10000
-      maxPoolSize: 5
-  crss-nmms:
-      datasource:
-        jdbcUrl: jdbc:postgresql://localhost:5432/crss_nmms
-        username: postgres
-        password: postgres
-        driverClassName: org.postgresql.Driver
-        connectionTimeout: 10000
-        maxPoolSize: 5
-  crss-stl:
-      datasource:
-        jdbcUrl: jdbc:postgresql://localhost:5432/crss_settlement
-        username: postgres
-        password: postgres
-        driverClassName: org.postgresql.Driver
-        connectionTimeout: 10000
-        maxPoolSize: 5
+      maxPoolSize: 20
+      test-on-borrow: true
+      validation-query: SELECT 1
   jpa:
     show-sql: false
     generate-ddl: false
@@ -61,18 +39,18 @@ server:
     enabled: true
     min-response-size: 1
 
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://localhost:8082/oauth/access_token
+      userAuthorizationUri: http://localhost:8082/oauth/authorize
+      clientId: crss
+      clientSecret: crsssecret
+      authorized-grant-types: authorization_code,refresh_token,password
+      scope: openid
+      access-token-validity-seconds: 3600
+    resource:
+      userInfoUri: http://localhost:8082/user
 
 logging:
   level:
@@ -97,4 +75,4 @@ sftp:
 # temporary todi-config, to be moved to general config
 todi-config:
   dispatch-interval: 5
-  max-retry: 2
+  max-retry: 2

crss-meterprocess-app/application-dev.yml

@@ -1,13 +1,4 @@
 spring:
-  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-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
@@ -95,6 +86,10 @@ job:
 security:
   ignored: /**
 
+management:
+  security:
+    enabled: false
+
 sftp:
   credentials:
     username: pemc

crss-meterprocess-app/application-dev2.yml

@@ -1,13 +1,4 @@
 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: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess

crss-meterprocess-app/application-qa.yml

@@ -1,13 +1,4 @@
 spring:
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_meterprocess

crss-meterprocess-app/application.yml

@@ -1,13 +1,4 @@
 spring:
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 5
-      test-on-borrow: true
-      validation-query: SELECT 1
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess

crss-mtr/application-dev.yml

@@ -62,10 +62,10 @@ logging:
 
 batch:
   resourceLocation: ${resourceLocation}
-  chunkSize: 100
+  chunkSize: 1
   maxWorkers: 10
   partitionSize:
-    mtr: 5000
+    mtr: 50
 
 mtr:
   directory: /tmp/

crss-mtr/application-dev2.yml

@@ -62,10 +62,10 @@ logging:
 
 batch:
   resourceLocation: ${resourceLocation}
-  chunkSize: 100
+  chunkSize: 1
   maxWorkers: 10
   partitionSize:
-    mtr: 5000
+    mtr: 50
 
 mtr:
   directory: /tmp/

crss-mtr/application-qa.yml

@@ -63,10 +63,10 @@ logging:
 
 batch:
   resourceLocation: ${resourceLocation}
-  chunkSize: 100
+  chunkSize: 1
   maxWorkers: 10
   partitionSize:
-    mtr: 5000
+    mtr: 50
 
 mtr:
   directory: /tmp/

crss-mtr/application.yml

@@ -52,10 +52,10 @@ logging:
 
 batch:
   resourceLocation: "file:target/libs/crss-meterprocess-task-mtr-1.0.0.BUILD-SNAPSHOT.jar"
-  chunkSize: 100
+  chunkSize: 1
   maxWorkers: 10
   partitionSize:
-    mtr: 1500
+    mtr: 50
 
 mtr:
   directory: /tmp

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

@@ -5,17 +5,9 @@ spring:
       username: admin
       password: password
       driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
-  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
-
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
     jpa:
       show-sql: false
       generate-ddl: true
@@ -71,6 +63,10 @@ dataflow:
 job:
   maxRun: 1
 
+report:
+  directory:
+    base: tmp/
+
 sftp:
   credentials:
     username: pemc

crss-settlement-app/application-dev.yml

@@ -5,17 +5,9 @@ spring:
       username: admin
       password: password
       driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
-  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
-
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
     jpa:
       show-sql: false
       generate-ddl: true
@@ -71,6 +63,10 @@ dataflow:
 job:
   maxRun: 1
 
+report:
+  directory:
+    base: tmp/
+
 sftp:
   credentials:
     username: pemc

crss-settlement-app/application-dev2.yml

@@ -5,17 +5,9 @@ spring:
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
-
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
     jpa:
       show-sql: false
       generate-ddl: true
@@ -71,6 +63,10 @@ dataflow:
 job:
   maxRun: 1
 
+report:
+  directory:
+    base: tmp/
+
 sftp:
   credentials:
     username: pemc

crss-settlement-app/application-qa.yml

@@ -5,17 +5,9 @@ spring:
       username: admin
       password: password
       driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
-      username: admin
-      password: password
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
-
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   jpa:
     show-sql: false
     generate-ddl: true
@@ -71,6 +63,10 @@ dataflow:
 job:
   maxRun: 1
 
+report:
+  directory:
+    base: tmp/
+
 sftp:
   credentials:
     username: pemc

crss-settlement-app/application.yml

@@ -5,17 +5,9 @@ spring:
       username: postgres
       password: postgres
       driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
-      connectionTimeout: 10000
-      maxPoolSize: 20
-
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
   jpa:
     show-sql: false
     generate-ddl: true
@@ -71,6 +63,10 @@ dataflow:
 job:
   maxRun: 1
 
+report:
+  directory:
+    base: tmp/
+
 sftp:
   credentials:
     username: pemc

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

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