Merge branch 'persistence' of https://git.ziemers.de/edu/BeuthBot into persistence

benruehl
2 parents 257a3b79 4a9dc0b4
Showing 3 changed files with 50 additions and 1 deletions
docker/wildfly/Dockerfile
docker/wildfly/modules/module.xml
docker/wildfly/standalone.xml
 FROM jboss/wildfly:10.1.0.Final
 RUN /opt/jboss/wildfly/bin/add-user.sh admin Admin
-COPY standalone.xml /opt/jboss/wildfly/standalone/configuration/standalone.xml
 \ No newline at end of file
+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/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
+
+#RUN /subsystem=datasources/jdbc-driver=org.postgresql:add(driver-name=postgresql, driver-module-name=postgresql, driver-xa-datasource-class-name=org.postgresql.xa.PGXADataSource)
+#RUN /subsystem=datasources/xa-data-source=postgresql:add(driver-name=postgresql, jndi-name="java:jboss/datasources/PostgreSQLDS", enabled=true)
+#RUN /subsystem=datasources/xa-data-source=postgresql/xa-datasource-properties=URL:add(value="jdbc:postgresql://localhost:5432/beuthbot")
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.0" name="postgresql">
+    <resources>
+        <!--https://jdbc.postgresql.org/download.html-->
+        <resource-root path="postgresql-9.3-1104.jdbc41.jar"/>
+    </resources>
+    <dependencies>
+        <module name="javax.api"/>
+        <module name="javax.transaction.api"/>
+    </dependencies>
+</module>
 \ No newline at end of file
@@ -417,6 +417,32 @@
             <client-config name="Standard-Client-Config"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:weld:3.0"/>
+
+        <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>
+                    <connection-property name="databaseName">beuthbot</connection-property>
+                    <driver>postgresql</driver>
+                    <security>
+                        <user-name>beuthbot_app</user-name>
+                        <password>VhS7WPVpdYEHYLpf</password>
+                    </security>
+                    <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>
+                <drivers>
+                    <driver name="postgresql" module="postgresql">
+                        <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>
+                    </driver>
+                </drivers>
+            </datasources>
+        </subsystem>
+
     </profile>
  
     <interfaces>