simplify configuration for postgres connection; rename postgresql to …

…postgres;

3-integration/connect-db/postgresql/openlibertyapplication.yaml → 3-integration/connect-db/postgres/openlibertyapplication.yaml

@@ -1,10 +1,10 @@
 apiVersion: openliberty.io/v1beta1
 kind: OpenLibertyApplication
 metadata:
-  name: javaee-cafe-connect-db-postgresql
+  name: javaee-cafe-connect-db-postgres
   namespace: open-liberty-demo
 spec:
   replicas: 1
   # Note: replace "${Your_DockerHub_Account}" with your Docker Hub account name
-  applicationImage: docker.io/${Your_DockerHub_Account}/javaee-cafe-connect-db-postgresql:latest
+  applicationImage: docker.io/${Your_DockerHub_Account}/javaee-cafe-connect-db-postgres:latest
   expose: true

3-integration/connect-db/postgresql/pom.xml → 3-integration/connect-db/postgres/pom.xml

@@ -17,9 +17,11 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
     <failOnMissingWebXml>false</failOnMissingWebXml>
-    <postgresql.server.name></postgresql.server.name>
-    <postgresql.user></postgresql.user>
-    <postgresql.password></postgresql.password>
+    <db.server.name></db.server.name>
+    <db.port.number></db.port.number>
+    <db.name></db.name>
+    <db.user></db.user>
+    <db.password></db.password>
   </properties>
   <dependencies>
     <dependency>
@@ -71,9 +73,11 @@
                   <libertyRuntimeVersion>[20.0.0.1,)</libertyRuntimeVersion>
                   <outputDirectory>${project.build.directory}/wlp-package</outputDirectory>
                   <bootstrapProperties>
-                    <postgresql.server.name>${postgresql.server.name}</postgresql.server.name>
-                    <postgresql.user>${postgresql.user}</postgresql.user>
-                    <postgresql.password>${postgresql.password}</postgresql.password>
+                    <db.server.name>${db.server.name}</db.server.name>
+                    <db.port.number>${db.port.number}</db.port.number>
+                    <db.name>${db.name}</db.name>
+                    <db.user>${db.user}</db.user>
+                    <db.password>${db.password}</db.password>
                   </bootstrapProperties>
                 </configuration>
               </execution>
@@ -85,7 +89,7 @@
             <version>3.1.2</version>
             <executions>
               <execution>
-                <id>copy-postgresql-driver</id>
+                <id>copy-jdbc-driver</id>
                 <phase>package</phase>
                 <goals>
                   <goal>copy-dependencies</goal>

3-integration/connect-db/postgresql/src/main/liberty/config/server.xml → 3-integration/connect-db/postgres/src/main/liberty/config/server.xml

@@ -22,21 +22,17 @@
         location="${server.config.dir}/apps/javaee-cafe.war">
     </webApplication>
 
-    <dataSource id="JavaEECafeDB"
-        jdbcDriverRef="postgresql-driver" jndiName="jdbc/JavaEECafeDB"
-        transactional="true" type="javax.sql.ConnectionPoolDataSource">
-        <properties databaseName="postgres" portNumber="5432"
-            serverName="${postgresql.server.name}" user="${postgresql.user}"
-            password="${postgresql.password}" />
+    <dataSource id="JavaEECafeDB" jndiName="jdbc/JavaEECafeDB">
+        <jdbcDriver libraryRef="driver-library" />
+        <properties.postgresql
+            serverName="${db.server.name}"
+            portNumber="${db.port.number}"
+            databaseName="${db.name}"
+            user="${db.user}"
+            password="${db.password}" />
     </dataSource>
 
-    <jdbcDriver id="postgresql-driver"
-        javax.sql.ConnectionPoolDataSource="org.postgresql.ds.PGConnectionPoolDataSource"
-        javax.sql.XADataSource="org.postgresql.xa.PGXADataSource"
-        libraryRef="postgresql-library" />
-
-    <library id="postgresql-library">
-        <fileset dir="${shared.resource.dir}"
-            id="PostgreSQLFileset" includes="postgresql-42.2.4.jar" />
+    <library id="driver-library">
+        <fileset dir="${shared.resource.dir}" includes="*.jar" />
     </library>
 </server>