Browse Source

Update dev2 and ss-combined profiles to use per schema datasource

dmendoza 8 years ago
parent
commit
90b8f035a3
22 changed files with 134 additions and 134 deletions
  1. 1 1
      crss-admin/crss-admin-ss-combined.yml
  2. 1 1
      crss-audit/crss-audit-dev2.yml
  3. 9 9
      crss-data/crss-data-ss-combined.yml
  4. 1 1
      crss-dataflow-app/crss-dataflow-app-dev2.yml
  5. 8 8
      crss-datainterface-task-ingest/crss-datainterface-task-ingest-dev2.yml
  6. 1 1
      crss-metering/crss-metering-ss-combined.yml
  7. 5 5
      crss-meterprocess-app/crss-meterprocess-app-dev2.yml
  8. 7 7
      crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-dev2.yml
  9. 4 4
      crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-dev2.yml
  10. 7 7
      crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-dev2.yml
  11. 9 9
      crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-dev2.yml
  12. 3 3
      crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-dev2.yml
  13. 5 5
      crss-mq-computation/crss-mq-computation-dev2.yml
  14. 5 5
      crss-mtr/crss-mtr-dev2.yml
  15. 3 3
      crss-reg/crss-reg-ss-combined.yml
  16. 3 3
      crss-sched/crss-sched-ss-combined.yml
  17. 1 1
      crss-settlement-app/crss-settlement-app-dev2.yml
  18. 14 14
      crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-dev2.yml
  19. 14 14
      crss-settlement-task-calculation/crss-settlement-task-calculation-dev2.yml
  20. 8 8
      crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-dev2.yml
  21. 8 8
      crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-dev2.yml
  22. 17 17
      crss-settlement-task-validation/crss-settlement-task-validation-dev2.yml

+ 1 - 1
crss-admin/crss-admin-ss-combined.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:postgresql://192.168.233.9:5432/crss_admin
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=admin
     username: crss_admin
     password: crss_admin
   mail:

+ 1 - 1
crss-audit/crss-audit-dev2.yml

@@ -1,7 +1,7 @@
 spring:
   crss-audit:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_audit
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=audit
       username: crss_audit
       password: crss_audit
       driverClassName: org.postgresql.Driver

+ 9 - 9
crss-data/crss-data-ss-combined.yml

@@ -1,14 +1,14 @@
 spring:
   datasource:
-    url: jdbc:postgresql://192.168.233.9:5432/crss_data
-    username: crss_data
-    password: crss_data
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataextraction
+    username: crss_dataextraction
+    password: crss_dataextraction
 crss:
   metadata:
     datasource:
-      url: jdbc:postgresql://192.168.233.9:5432/crss_data
-      username: crss_data
-      password: crss_data
+      url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataextraction
+      username: crss_dataextraction
+      password: crss_dataextraction
   datawarehouse:
     datasource:
       platform: oracle
@@ -18,6 +18,6 @@ crss:
       driverClassName: oracle.jdbc.OracleDriver
   registration:
      datasource:
-       url: jdbc:postgresql://192.168.233.9:5432/crss_reg
-       username: crss_reg
-       password: crss_reg
+       url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+       username: crss_registration
+       password: crss_registration

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

@@ -1,7 +1,7 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver

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

@@ -6,25 +6,25 @@ spring:
       password: 123qwe
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/todi_crss_nmms
-      username: todi_crss_nmms
-      password: todi_crss_nmms
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmms
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/todi_crss_reg
-      username: todi_crss_reg
-      password: todi_crss_reg
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
       driverClassName: org.postgresql.Driver
   crss-settlements:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver

+ 1 - 1
crss-metering/crss-metering-ss-combined.yml

@@ -1,7 +1,7 @@
 spring:
   profiles.include: pg-query
   datasource:
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
     username: crss_metering
     password: crss_metering
 

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

@@ -1,19 +1,19 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
       driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_nmms
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
       driverClassName: org.postgresql.Driver

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

@@ -1,19 +1,19 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_metering2
-      username: crss_metering2
-      password: crss_metering2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
       driverClassName: org.postgresql.Driver

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

@@ -1,13 +1,13 @@
 spring:
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver

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

@@ -1,19 +1,19 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_metering2
-      username: crss_metering2
-      password: crss_metering2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
       driverClassName: org.postgresql.Driver

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

@@ -2,9 +2,9 @@
 spring:
   profiles: dailyExtract
   datasource:
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering2
-    username: crss_metering2
-    password: crss_metering2
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
     driver-class-name: org.postgresql.Driver
 
 jdbc:
@@ -17,9 +17,9 @@ jdbc:
 spring:
   profiles: monthlyExtract
   datasource:
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering2
-    username: crss_metering2
-    password: crss_metering2
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
     driver-class-name: org.postgresql.Driver
 
 jdbc:
@@ -32,9 +32,9 @@ jdbc:
 # default
 spring:
   datasource:
-    url: jdbc:postgresql://192.168.233.9:5432/crss_metering2
-    username: crss_metering2
-    password: crss_metering2
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
+    username: crss_metering
+    password: crss_metering
     driver-class-name: org.postgresql.Driver
 
 jdbc:

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

@@ -1,19 +1,19 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-nmms:
       datasource:
-        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_nmms
+        jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=nmms
         username: crss_nmms
         password: crss_nmms
         driverClassName: org.postgresql.Driver

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

@@ -1,21 +1,21 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
       driverClassName: org.postgresql.Driver
 
   profiles:

+ 5 - 5
crss-mtr/crss-mtr-dev2.yml

@@ -1,21 +1,21 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_reg2
-      username: crss_reg2
-      password: crss_reg2
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
       driverClassName: org.postgresql.Driver
 
   profiles:

+ 3 - 3
crss-reg/crss-reg-ss-combined.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:postgresql://192.168.233.9:5432/crss_reg
-    username: crss_reg
-    password: crss_reg
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+    username: crss_registration
+    password: crss_registration
 crss:
   docmgt:
     root-dir: /crss/docmgt

+ 3 - 3
crss-sched/crss-sched-ss-combined.yml

@@ -1,6 +1,6 @@
 spring:
   profiles.include: metronome
   datasource:
-    url: jdbc:postgresql://192.168.233.9:5432/crss_sched
-    username: crss_sched
-    password: crss_sched
+    url: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=scheduler
+    username: crss_scheduler
+    password: crss_scheduler

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

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver

+ 14 - 14
crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-dev2.yml

@@ -1,38 +1,38 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_meterprocess
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_meterprocess
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_metering
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
       driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_nmms
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmms
       driverClassName: org.postgresql.Driver
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver

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

@@ -1,38 +1,38 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_meterprocess
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_meterprocess
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_metering
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
       driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_nmms
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmms
       driverClassName: org.postgresql.Driver
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver

+ 8 - 8
crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-dev2.yml

@@ -1,26 +1,26 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_meterprocess
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_meterprocess
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
       driverClassName: org.postgresql.Driver

+ 8 - 8
crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-dev2.yml

@@ -1,26 +1,26 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_meterprocess
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_meterprocess
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
       driverClassName: org.postgresql.Driver

+ 17 - 17
crss-settlement-task-validation/crss-settlement-task-validation-dev2.yml

@@ -1,43 +1,43 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_reg
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: crss_registration
       driverClassName: org.postgresql.Driver
   crss-meterprocess:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_meterprocess
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_meterprocess
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
       driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_metering
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
       driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/stl_crss_nmms
-      username: crss_settlement
-      password: crss_settlement
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmss
       driverClassName: org.postgresql.Driver
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
+      jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: org.postgresql.Driver