From 135a3d8f36d5f08c63e11233210e58f9bdbad655 Mon Sep 17 00:00:00 2001
From: kochetkov <s.kochetkov@micord.ru>
Date: Thu, 21 Nov 2024 10:42:09 +0300
Subject: [PATCH 1/2] fix absolute paths for testing

---
 config-data-executor/src/main/resources/application.yml | 2 +-
 config/standalone.xml                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config-data-executor/src/main/resources/application.yml b/config-data-executor/src/main/resources/application.yml
index 789b675..0cf969f 100644
--- a/config-data-executor/src/main/resources/application.yml
+++ b/config-data-executor/src/main/resources/application.yml
@@ -1 +1 @@
-configDirectory: C:\work\ervu-secret\config\cde-xml
+configDirectory: C:\work\ervu-eks\config\cde-xml
diff --git a/config/standalone.xml b/config/standalone.xml
index cb08a11..dad0588 100644
--- a/config/standalone.xml
+++ b/config/standalone.xml
@@ -58,7 +58,7 @@
         <property name="config.data.executor.url" value="http://localhost:8080/config-data-executor/api"/>
         <property name="config.data.executor.socket.timeout" value="10"/>
         <property name="config.data.executor.connection.timeout" value="10"/>
-        <property name="configDirectory" value="C:\work\ervu-secret\config-data-executor\config-examples"/>
+        <property name="configDirectory" value="C:\work\ervu-eks\config-data-executor\config-examples"/>
     </system-properties>
     <management>
         <audit-log>

From e9360a5eabae8d2c5d317b561d7d9b4672d16442 Mon Sep 17 00:00:00 2001
From: kochetkov <s.kochetkov@micord.ru>
Date: Thu, 21 Nov 2024 10:50:01 +0300
Subject: [PATCH 2/2] fix db entity names

---
 config/db.env                                      | 12 ++++++------
 config/initdb.d/createdb.sql                       | 14 +++++++-------
 config/micord.env                                  | 12 ++++++------
 config/standalone.xml                              | 12 ++++++------
 .../src/main/resources/database/datasource.xml     |  8 ++++----
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/config/db.env b/config/db.env
index 1bdf427..ed18bf6 100644
--- a/config/db.env
+++ b/config/db.env
@@ -1,16 +1,16 @@
 # App datasource
-DB_APP_NAME=ervu-eks
+DB_APP_NAME=ervu_eks
 DB_APP_HOST=db
 DB_APP_PORT=5432
-DB_APP_USERNAME=ervu-eks
-DB_APP_PASSWORD=ervu-eks
+DB_APP_USERNAME=ervu_eks
+DB_APP_PASSWORD=ervu_eks
 
 # Security datasource
-DB_SEC_NAME=ervu-eks
+DB_SEC_NAME=ervu_eks
 DB_SEC_HOST=db
 DB_SEC_PORT=5432
-DB_SEC_USERNAME=ervu-eks-sec
-DB_SEC_PASSWORD=ervu-eks-sec
+DB_SEC_USERNAME=ervu_eks_sec
+DB_SEC_PASSWORD=ervu_eks_sec
 
 # Person datasource
 DB_PERSON_NAME=person_registry
diff --git a/config/initdb.d/createdb.sql b/config/initdb.d/createdb.sql
index 50b18f2..85d41af 100644
--- a/config/initdb.d/createdb.sql
+++ b/config/initdb.d/createdb.sql
@@ -1,23 +1,23 @@
-CREATE ROLE "ervu-eks" WITH
+CREATE ROLE "ervu_eks" WITH
   LOGIN
   NOSUPERUSER
   INHERIT
   NOCREATEDB
   NOCREATEROLE
   NOREPLICATION
-  PASSWORD 'ervu-eks';
+  PASSWORD 'ervu_eks';
 
-CREATE ROLE "ervu-eks-sec" WITH
+CREATE ROLE "ervu_eks_sec" WITH
   LOGIN
   NOSUPERUSER
   INHERIT
   NOCREATEDB
   NOCREATEROLE
   NOREPLICATION
-  PASSWORD 'ervu-eks-sec';
+  PASSWORD 'ervu_eks_sec';
 
-CREATE DATABASE "ervu-eks"
+CREATE DATABASE "ervu_eks"
     WITH
-    OWNER = "ervu-eks";
+    OWNER = "ervu_eks";
 
-GRANT CREATE ON DATABASE "ervu-eks" TO "ervu-eks-sec";
+GRANT CREATE ON DATABASE "ervu_eks" TO "ervu_eks_sec";
diff --git a/config/micord.env b/config/micord.env
index 47f9e2d..0827e7a 100644
--- a/config/micord.env
+++ b/config/micord.env
@@ -1,18 +1,18 @@
 TZ=Europe/Moscow
 
 # App datasource
-DB_APP_USERNAME=ervu-eks
-DB_APP_PASSWORD=ervu-eks
+DB_APP_USERNAME=ervu_eks
+DB_APP_PASSWORD=ervu_eks
 DB_APP_HOST=10.10.31.118
 DB_APP_PORT=5432
-DB_APP_NAME=ervu-eks
+DB_APP_NAME=ervu_eks
 
 # Security datasource
-DB_SEC_USERNAME=ervu-eks-sec
-DB_SEC_PASSWORD=ervu-eks-sec
+DB_SEC_USERNAME=ervu_eks_sec
+DB_SEC_PASSWORD=ervu_eks_sec
 DB_SEC_HOST=10.10.31.118
 DB_SEC_PORT=5432
-DB_SEC_NAME=ervu-eks
+DB_SEC_NAME=ervu_eks
 
 # Person datasource
 DB_PERSON_USERNAME=ervu
diff --git a/config/standalone.xml b/config/standalone.xml
index dad0588..c7534f1 100644
--- a/config/standalone.xml
+++ b/config/standalone.xml
@@ -156,11 +156,11 @@
                 <xa-datasource jndi-name="java:/webbpm/AppDS" pool-name="AppDS" enabled="true" use-java-context="true">
                     <xa-datasource-property name="ServerName">10.10.31.118</xa-datasource-property>
                     <xa-datasource-property name="PortNumber">5432</xa-datasource-property>
-                    <xa-datasource-property name="DatabaseName">ervu-eks</xa-datasource-property>
+                    <xa-datasource-property name="DatabaseName">ervu_eks</xa-datasource-property>
                     <driver>postgresql</driver>
                     <security>
-                        <user-name>ervu-eks</user-name>
-                        <password>ervu-eks</password>
+                        <user-name>ervu_eks</user-name>
+                        <password>ervu_eks</password>
                     </security>
                     <validation>
                         <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker" />
@@ -173,11 +173,11 @@
 		<xa-datasource jndi-name="java:/webbpm/security-ds" pool-name="SECURITYDS" enabled="true" use-java-context="true">
                     <xa-datasource-property name="ServerName">10.10.31.118</xa-datasource-property>
                     <xa-datasource-property name="PortNumber">5432</xa-datasource-property>
-                    <xa-datasource-property name="DatabaseName">ervu-eks</xa-datasource-property>
+                    <xa-datasource-property name="DatabaseName">ervu_eks</xa-datasource-property>
                     <driver>postgresql</driver>
                     <security>
-                        <user-name>ervu-eks-sec</user-name>
-                        <password>ervu-eks-sec</password>
+                        <user-name>ervu_eks_sec</user-name>
+                        <password>ervu_eks_sec</password>
                     </security>
                     <validation>
                         <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker" />
diff --git a/resources/src/main/resources/database/datasource.xml b/resources/src/main/resources/database/datasource.xml
index 2159850..1b9ec77 100644
--- a/resources/src/main/resources/database/datasource.xml
+++ b/resources/src/main/resources/database/datasource.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <datasource>
     <dbBeanPackage>ru.micord.ervu.eks.db_beans</dbBeanPackage>
-    <dbName>ervu-eks</dbName>
+    <dbName>ervu_eks</dbName>
     <driverClassName>org.postgresql.Driver</driverClassName>
     <host>10.10.31.118</host>
     <manually>false</manually>
-    <password>ervu-eks</password>
+    <password>ervu_eks</password>
     <port>5432</port>
     <replicaJndiNames>java:/webbpm/personRegistryDS</replicaJndiNames>
     <schemas>public</schemas>
     <sqlDialect>POSTGRES</sqlDialect>
-    <url>jdbc:postgresql://10.10.31.118:5432/ervu-eks</url>
+    <url>jdbc:postgresql://10.10.31.118:5432/ervu_eks</url>
     <urlPrefix>jdbc:postgresql:</urlPrefix>
-    <user>ervu-eks</user>
+    <user>ervu_eks</user>
 </datasource>