Merge branch '2.0.x' into 2.1.x

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

@@ -1,7 +1,7 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow&ApplicationName=dataflowApp
       username: crss_sit_dataflow
       password: uYgE8bqG
 

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

@@ -6,16 +6,16 @@ spring:
       password: emdb
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow&ApplicationName=todiIngest
       username: crss_sit_dataflow
       password: uYgE8bqG
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms&ApplicationName=todiIngest
       username: crss_sit_nmms
       password: tEglXBQd
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration&ApplicationName=todiIngest
       username: crss_sit_registration
       password: 6UZU8ilC

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

@@ -1,17 +1,17 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess&ApplicationName=meterprocessApp
       username: crss_sit_meterprocess
       password: PmfXsUQp
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration&ApplicationName=meterprocessApp
       username: crss_sit_registration
       password: 6UZU8ilC
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms&ApplicationName=meterprocessApp
       username: crss_sit_nmms
       password: tEglXBQd
 

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

@@ -1,16 +1,16 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess&ApplicationName=streamSink
       username: crss_sit_meterprocess
       password: PmfXsUQp
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering&ApplicationName=streamSink
       username: crss_sit_metering
       password: XmI6Yr1B
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration&ApplicationName=streamSink
       username: crss_sit_registration
       password: 6UZU8ilC

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

@@ -1,11 +1,11 @@
 spring:
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration&ApplicationName=streamMapper
       username: crss_sit_registration
       password: 6UZU8ilC
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess&ApplicationName=streamMapper
       username: crss_sit_meterprocess
       password: PmfXsUQp

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

@@ -1,16 +1,16 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess&ApplicationName=streamValidate
       username: crss_sit_meterprocess
       password: PmfXsUQp
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering&ApplicationName=streamValidate
       username: crss_sit_metering
       password: XmI6Yr1B
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration&ApplicationName=streamValidate
       username: crss_sit_registration
       password: 6UZU8ilC

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

@@ -2,7 +2,7 @@
 spring:
   profiles: dailyExtract
   datasource:
-    url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+    url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering&ApplicationName=streamSource
     username: crss_sit_metering
     password: XmI6Yr1B
 
@@ -12,7 +12,7 @@ spring:
 spring:
   profiles: monthlyExtract
   datasource:
-    url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+    url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering&ApplicationName=streamSource
     username: crss_sit_metering
     password: XmI6Yr1B
 
@@ -21,7 +21,7 @@ spring:
 # default
 spring:
   datasource:
-    url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+    url: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering&ApplicationName=streamSource
     username: crss_sit_metering
     password: XmI6Yr1B
 

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

@@ -1,17 +1,17 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow&ApplicationName=stlready
       username: crss_sit_dataflow
       password: uYgE8bqG
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess&ApplicationName=stlready
       username: crss_sit_meterprocess
       password: PmfXsUQp
   crss-nmms:
       datasource:
-        jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms
+        jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms&appl=secret&ApplicationName=stlready
         username: crss_sit_nmms
         password: tEglXBQd
 

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

@@ -1,17 +1,17 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow&ApplicationName=mqComputation
       username: crss_sit_dataflow
       password: uYgE8bqG
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess&ApplicationName=mqComputation
       username: crss_sit_meterprocess
       password: PmfXsUQp
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration&ApplicationName=mqComputation
       username: crss_sit_registration
       password: 6UZU8ilC
 

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

@@ -1,17 +1,17 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow&ApplicationName=mtr
       username: crss_sit_dataflow
       password: uYgE8bqG
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess&ApplicationName=mtr
       username: crss_sit_meterprocess
       password: PmfXsUQp
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration&ApplicationName=mtr
       username: crss_sit_registration
       password: 6UZU8ilC
 

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

@@ -1,6 +1,6 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement&ApplicationName=stlApp
       username: crss_sit_settlement
       password: FEeHqREu

crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-top-sit.yml

@@ -1,27 +1,27 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement&ApplicationName=stlAddtlComp
       username: crss_sit_settlement
       password: FEeHqREu
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess&ApplicationName=stlAddtlComp
       username: crss_sit_meterprocess
       password: PmfXsUQp
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering&ApplicationName=stlAddtlComp
       username: crss_sit_metering
       password: XmI6Yr1B
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms&ApplicationName=stlAddtlComp
       username: crss_sit_nmms
       password: tEglXBQd
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow&ApplicationName=stlAddtlComp
       username: crss_sit_dataflow
       password: uYgE8bqG
 

crss-settlement-task-calculation/crss-settlement-task-calculation-top-sit.yml

@@ -1,27 +1,27 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement&ApplicationName=stlCalculation
       username: crss_sit_settlement
       password: FEeHqREu
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess&ApplicationName=stlCalculation
       username: crss_sit_meterprocess
       password: PmfXsUQp
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering&ApplicationName=stlCalculation
       username: crss_sit_metering
       password: XmI6Yr1B
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms&ApplicationName=stlCalculation
       username: crss_sit_nmms
       password: tEglXBQd
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow&ApplicationName=stlCalculation
       username: crss_sit_dataflow
       password: uYgE8bqG
 

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-top-sit.yml

@@ -1,17 +1,17 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement&ApplicationName=stlAddtlCompFileGen
       username: crss_sit_settlement
       password: FEeHqREu
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow&ApplicationName=stlAddtlCompFileGen
       username: crss_sit_dataflow
       password: uYgE8bqG
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess&ApplicationName=stlAddtlCompFileGen
       username: crss_sit_meterprocess
       password: PmfXsUQp
       connectionTimeout: 10000

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-top-sit.yml

@@ -1,16 +1,16 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement&ApplicationName=stlInvoiceGen
       username: crss_sit_settlement
       password: FEeHqREu
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow&ApplicationName=stlInvoiceGen
       username: crss_sit_dataflow
       password: uYgE8bqG
   crss-main:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=meterprocess&ApplicationName=stlInvoiceGen
       username: crss_sit_meterprocess
       password: PmfXsUQp

crss-settlement-task-validation/crss-settlement-task-validation-top-sit.yml

@@ -1,26 +1,26 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=settlement&ApplicationName=stlValidation
       username: crss_sit_settlement
       password: FEeHqREu
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=registration&ApplicationName=stlValidation
       username: crss_sit_registration
       password: 6UZU8ilC
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=metering&ApplicationName=stlValidation
       username: crss_sit_metering
       password: XmI6Yr1B
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=nmms&ApplicationName=stlValidation
       username: crss_sit_nmms
       password: tEglXBQd
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
+      jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow&ApplicationName=stlValidation
       username: crss_sit_dataflow
       password: uYgE8bqG