Преглед на файлове

make driver class name parametarized in azure

jdogillo преди 8 години
родител
ревизия
b5773ac376
променени са 21 файла, в които са добавени 61 реда и са изтрити 63 реда
  1. 4 1
      crss-data/crss-data-azure.yml
  2. 1 1
      crss-dataflow-app/crss-dataflow-app-azure.yml
  3. 1 1
      crss-datainterface-app/crss-datainterface-app-azure.yml
  4. 3 3
      crss-datainterface-task-ingest/crss-datainterface-task-ingest-azure.yml
  5. 0 1
      crss-metering/crss-metering-azure.yml
  6. 3 3
      crss-meterprocess-app/crss-meterprocess-app-azure.yml
  7. 3 3
      crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-azure.yml
  8. 2 2
      crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-azure.yml
  9. 3 3
      crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-azure.yml
  10. 3 3
      crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-azure.yml
  11. 3 3
      crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-azure.yml
  12. 3 3
      crss-mq-computation/crss-mq-computation-azure.yml
  13. 3 3
      crss-mtr/crss-mtr-azure.yml
  14. 2 2
      crss-reg/crss-reg-azure.yml
  15. 1 1
      crss-settlement-app/crss-settlement-app-azure.yml
  16. 6 6
      crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-azure.yml
  17. 6 6
      crss-settlement-task-calculation/crss-settlement-task-calculation-azure.yml
  18. 3 6
      crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-azure.yml
  19. 4 4
      crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-azure.yml
  20. 7 7
      crss-settlement-task-validation/crss-settlement-task-validation-azure.yml
  21. 0 1
      crss-uaa/crss-uaa-azure.yml

+ 4 - 1
crss-data/crss-data-azure.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    driverClassName: org.postgresql.Driver
+    driverClassName: "${spring.datasource.driverClassName}"
     # TODO: Should be replaced with psql after UAT
     url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataextraction
 #    url: jdbc:oracle:thin:@10.64.0.4:1521:ORCL
@@ -9,17 +9,20 @@ spring:
 crss:
   metadata:
     datasource:
+      driverClassName: "${spring.datasource.driverClassName}"
       url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataextraction
       username: crss_dataextraction
       password: crss_dataextraction
   datawarehouse:
     datasource:
+      driverClassName: "${spring.datasource.driverClassName}"
       platform: postgresql
       url: jdbc:postgresql://10.64.0.4:5432/crss_dw
       username: crss_dw
       password: crss_dw
   registration:
      datasource:
+       driverClassName: "${spring.datasource.driverClassName}"
        url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
        username: crss_registration
        password: crss_registration

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

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

+ 1 - 1
crss-datainterface-app/crss-datainterface-app-azure.yml

@@ -1,7 +1,7 @@
 spring:
   crss-nmms:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms

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

@@ -1,19 +1,19 @@
 spring:
   crss-dataflow:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
   crss-nmms:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
   crss-registration:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration

+ 0 - 1
crss-metering/crss-metering-azure.yml

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

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

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

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

@@ -1,19 +1,19 @@
 spring:
   crss-main:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
   crss-metering:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
       username: crss_metering
       password: crss_metering
   crss-registration:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration

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

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

+ 3 - 3
crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-azure.yml

@@ -1,19 +1,19 @@
 spring:
   crss-main:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
   crss-metering:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
       username: crss_metering
       password: crss_metering
   crss-registration:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration

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

@@ -2,7 +2,7 @@
 spring:
   profiles: dailyExtract
   datasource:
-    driverClassName: org.postgresql.Driver
+    driverClassName: "${spring.datasource.driverClassName}"
     password: crss_metering
     username: crss_metering
     url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
@@ -17,7 +17,7 @@ jdbc:
 spring:
   profiles: monthlyExtract
   datasource:
-    driverClassName: org.postgresql.Driver
+    driverClassName: "${spring.datasource.driverClassName}"
     password: crss_metering
     username: crss_metering
     url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
@@ -31,7 +31,7 @@ jdbc:
 # default
 spring:
   datasource:
-    driverClassName: org.postgresql.Driver
+    driverClassName: "${spring.datasource.driverClassName}"
     password: crss_metering
     username: crss_metering
     url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering

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

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

+ 3 - 3
crss-mq-computation/crss-mq-computation-azure.yml

@@ -1,19 +1,19 @@
 spring:
   crss-dataflow:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
   crss-main:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
   crss-registration:
     dataSource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration

+ 3 - 3
crss-mtr/crss-mtr-azure.yml

@@ -3,19 +3,19 @@ spring:
     include: mesos
   crss-dataflow:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
   crss-main:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
   crss-registration:
     dataSource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration

+ 2 - 2
crss-reg/crss-reg-azure.yml

@@ -1,12 +1,12 @@
 spring:
   datasource:
-    driverClassName: org.postgresql.Driver
+    driverClassName: "${spring.datasource.driverClassName}"
     url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
     username: crss_registration
     password: crss_registration
   xdf-control:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=xdfcontrol
       username: crss_xdf_control
       password: crss_xdf_control

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

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

+ 6 - 6
crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-azure.yml

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

+ 6 - 6
crss-settlement-task-calculation/crss-settlement-task-calculation-azure.yml

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

+ 3 - 6
crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-azure.yml

@@ -1,22 +1,19 @@
 spring:
   crss-stl:
     datasource:
-      driverClassName: org.postgresql.Driver
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
   crss-dataflow:
     datasource:
-      driverClassName: org.postgresql.Driver
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
   crss-main:
     datasource:
-      driverClassName: org.postgresql.Driver
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"

+ 4 - 4
crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-azure.yml

@@ -1,14 +1,14 @@
 spring:
   crss-stl:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
       maxPoolSize: 20
   crss-dataflow:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
@@ -16,7 +16,7 @@ spring:
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
@@ -24,7 +24,7 @@ spring:
       maxPoolSize: 20
   crss-main:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess

+ 7 - 7
crss-settlement-task-validation/crss-settlement-task-validation-azure.yml

@@ -1,44 +1,44 @@
 spring:
   crss-stl:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
   crss-registration:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration
   # for removal after ITER 7 stl testing
   crss-meterprocess:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
   crss-main:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
   crss-metering:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
       username: crss_metering
       password: crss_metering
   crss-nmms:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
   crss-dataflow:
     datasource:
-      driverClassName: org.postgresql.Driver
+      driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow

+ 0 - 1
crss-uaa/crss-uaa-azure.yml

@@ -4,7 +4,6 @@ spring:
   redis:
     database: 2
   datasource:
-    driverClassName: org.postgresql.Driver
     url: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=admin
     username: crss_admin
     password: crss_admin