Add persistence pool and a few maybe-fixes to standalone.xml

Benjamin Rühl
1 parent 8a9e8de4
Showing 4 changed files with 36 additions and 9 deletions
docker/docker-compose.yml
docker/wildfly/Dockerfile
docker/wildfly/modules/module.xml → docker/wildfly/modules/org/postgres/main/module.xml
docker/wildfly/standalone.xml
@@ -32,7 +32,6 @@ services:
   postgres-db:
     container_name: chatbot-postgres
     image: postgres
-    restart: always
     ports:
        - "5432:5432"
     environment:
@@ -43,6 +42,5 @@ services:
   adminer:
     container_name: adminer_dbmanagement
     image: adminer
-    restart: always
     ports:
       - "8081:8080"
 \ No newline at end of file
@@ -4,8 +4,8 @@ COPY standalone.xml /opt/jboss/wildfly/standalone/configuration/standalone.xml
 #USER root
-ADD modules/postgresql-42.1.4.jar /opt/jboss/wildfly/modules/org/postgres/main/postgresql-42.1.4.jar
-ADD modules/module.xml /opt/jboss/wildfly/modules/org/postgres/main/module.xml
+ADD modules/org/postgres/main/postgresql-42.1.4.jar /opt/jboss/wildfly/modules/org/postgres/main/postgresql-42.1.4.jar
+ADD modules/org/postgres/main/module.xml /opt/jboss/wildfly/modules/org/postgres/main/module.xml
 #ADD modules/postgresql-42.1.4.jar /opt/jboss/wildfly/modules/system/layers/base/org/postgres/main/postgresql-42.1.4.jar
 #ADD modules/module.xml /opt/jboss/wildfly/modules/system/layers/base/org/postgres/main/module.xml
 <?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.0" name="postgresql">
+<module xmlns="urn:jboss:module:1.1" name="org.postgres">
     <resources>
         <!--https://jdbc.postgresql.org/download.html-->
-        <resource-root path="postgresql-9.3-1104.jdbc41.jar"/>
+        <resource-root path="postgresql-42.1.4.jar"/>
     </resources>
     <dependencies>
         <module name="javax.api"/>
         <module name="javax.transaction.api"/>
+        <module name="javax.servlet.api" optional="true"/>
     </dependencies>
 </module>
 \ No newline at end of file
@@ -420,21 +420,49 @@
         <subsystem xmlns="urn:jboss:domain:datasources:2.0">
             <datasources>
-                <datasource jta="true" jndi-name="java:jboss/datasources/PostgreSQLDS" pool-name="postgresql" enabled="true" use-java-context="true">
-                    <connection-url>jdbc:postgresql://localhost:5432/beuthbot</connection-url>
+                <datasource jta="true" jndi-name="java:jboss/datasources/PostgreSQLDS" pool-name="PostgreSQLDS" enabled="true" use-java-context="true">
+                    <connection-url>jdbc:postgresql://postgres-db:5432/beuthbot</connection-url>
                     <connection-property name="databaseName">beuthbot</connection-property>
                     <driver>postgresql</driver>
                     <security>
                         <user-name>beuthbot_app</user-name>
                         <password>VhS7WPVpdYEHYLpf</password>
                     </security>
+                    <pool>
+                        <min-pool-size>5</min-pool-size>
+                        <initial-pool-size>5</initial-pool-size>
+                        <max-pool-size>100</max-pool-size>
+                        <prefill>true</prefill>
+                    </pool>
                     <validation>
                         <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker"/>
                         <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter"/>
                     </validation>
                 </datasource>
+
+                <xa-datasource jndi-name="java:jboss/datasources/PgDsXaWildFlyDb" pool-name="PgDsXaWildflyDb" enabled="true" use-java-context="true">
+                    <driver>postgresql</driver>
+                    <xa-datasource-property name="ServerName">postgres-db</xa-datasource-property>
+                    <xa-datasource-property name="PortNumber">5432</xa-datasource-property>
+                    <xa-datasource-property name="DatabaseName">beuthbot</xa-datasource-property>
+                    <xa-pool>
+                        <min-pool-size>5</min-pool-size>
+                        <initial-pool-size>5</initial-pool-size>
+                        <max-pool-size>100</max-pool-size>
+                        <prefill>true</prefill>
+                    </xa-pool>
+                    <validation>
+                        <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker"/>
+                        <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter"/>
+                    </validation>
+                    <security>
+                        <user-name>beuthbot_app</user-name>
+                        <password>VhS7WPVpdYEHYLpf</password>
+                    </security>
+                </xa-datasource>
+
                 <drivers>
-                    <driver name="postgresql" module="postgresql">
+                    <driver name="postgresql" module="org.postgres">
                         <driver-class>org.postgresql.Driver</driver-class>
                         <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
                         <datasource-class>org.postgresql.ds.PGSimpleDataSource</datasource-class>