Jakarta EE 10

Jakarta-EE-Petclinic · Oct 26, 2022 · 2399094 · 2399094
1 parent 0525ab8
commit 2399094
Show file tree

Hide file tree

Showing 10 changed files with 1,254 additions and 12 deletions.
diff --git a/etc/payara-resources_1_7.dtd b/etc/payara-resources_1_7.dtd
diff --git a/pom.xml b/pom.xml
@@ -85,7 +85,7 @@
 		<version.org.primefaces>12.0.0-RC3</version.org.primefaces>
 
 		<!-- OpenLiberty -->
-		<version.openliberty-runtime>22.0.0.10</version.openliberty-runtime>
+		<version.openliberty-runtime>22.0.0.11</version.openliberty-runtime>
 		<version.liberty-maven-plugin>3.7.1</version.liberty-maven-plugin>
 		<generateFeatures>false</generateFeatures>
 		<runtime.jakartaee.server.openliberty.remote>/opt/openliberty/wlp</runtime.jakartaee.server.openliberty.remote>
@@ -108,7 +108,7 @@
 		<version.wildfly-arquillian>5.0.0.Alpha5</version.wildfly-arquillian>
 
 		<!-- Payara -->
-		<version.payara-runtime>6.2022.1.Alpha4</version.payara-runtime>
+		<version.payara-runtime>6.2022.1.Alpha2</version.payara-runtime>
 		<version.payara>${version.payara-runtime}</version.payara>
 		<version.payaramicro.maven.plugin>1.4.0</version.payaramicro.maven.plugin>
 		<version.arquillian-payara>3.0.alpha6</version.arquillian-payara>
@@ -3717,12 +3717,14 @@
 				<skip.integration.tests>false</skip.integration.tests>
 			</properties>
 			<dependencies>
+				<!--
 				<dependency>
 					<groupId>fish.payara.arquillian</groupId>
 					<artifactId>payara-client-ee9</artifactId>
 					<version>${version.arquillian-payara}</version>
 					<scope>test</scope>
 				</dependency>
+				-->
 				<dependency>
 					<groupId>fish.payara.arquillian</groupId>
 					<artifactId>arquillian-payara-server-managed</artifactId>
@@ -3737,6 +3739,16 @@
 					<scope>test</scope>
 				</dependency>
 				-->
+				<dependency>
+					<groupId>fish.payara.arquillian</groupId>
+					<artifactId>environment-setup</artifactId>
+					<version>${version.arquillian-payara}</version>
+				</dependency>
+				<dependency>
+					<groupId>fish.payara.arquillian</groupId>
+					<artifactId>integration-tests</artifactId>
+					<version>${version.arquillian-payara}</version>
+				</dependency>
 				<dependency>
 					<groupId>org.postgresql</groupId>
 					<artifactId>postgresql</artifactId>
@@ -3789,7 +3801,7 @@
 						<version>${version.maven-failsafe-plugin}</version>
 						<configuration>
 							<systemPropertyVariables>
-								<payara.home>${project.build.directory}/payara5</payara.home>
+								<payara.home>${project.build.directory}/payara6</payara.home>
 								<arquillian.launch>payara-managed</arquillian.launch>
 							</systemPropertyVariables>
 						</configuration>

diff --git a/src/main/liberty/config/server.xml b/src/main/liberty/config/server.xml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <server description="defaultServer">
 	<featureManager>
+		<!--
 		<feature>jakartaee-9.1</feature>
 		<feature>microprofile-5.0</feature>
+		-->
+		<feature>restfulWS-3.1</feature>
+		<feature>jsonb-3.0</feature>
+		<feature>jsonp-2.1</feature>
+		<feature>jsonbContainer-3.0</feature>
+		<feature>jsonpContainer-2.1</feature>
+		<feature>cdi-4.0</feature>
+		<feature>expressionLanguage-5.0</feature>
+		<feature>concurrent-3.0</feature>
+		<feature>jdbc-4.2</feature>
+		<feature>web-6.0</feature>
 	</featureManager>
 
 	<include location="userRegistry.xml"/>

diff --git a/src/main/resources/META-INF/payara-resource.xml b/src/main/resources/META-INF/payara-resource.xml
@@ -0,0 +1,22 @@
+<!DOCTYPE resources PUBLIC "-//Payara.fish//DTD Payara Server 4 Resource Definitions//EN"
+        "http://docs.payara.fish/schemas/payara-resources_1_7.dtd">
+<resources>
+
+    <jdbc-resource pool-name="PostgresDS"
+                   jndi-name="jdbc/petclinicDS"
+                   object-type="system-all"
+                   enabled="yes" />
+
+    <jdbc-connection-pool name="PostgresDS"
+                          res-type="javax.sql.DataSource"
+                          driver-classname="org.postgresql.Driver"
+                          datasource-classname="org.postgresql.ds.PGConnectionPoolDataSource">
+        <property name="url" value="jdbc:postgresql://localhost:5432/petclinic_jakartaee_payara"/>
+        <property name="user" value="petclinic_jakartaee"/>
+        <property name="password" value="petclinic_jakartaeepwd"/>
+        <property name="databaseName" value="petclinic_jakartaee_payara"/>
+        <property name="serverName" value="localhost"/>
+        <property name="portNumber" value="5432"/>
+        <property name="driver" value="petclinic.war_org.postgresql.Driver_42_5"/>
+    </jdbc-connection-pool>
+</resources>
diff --git a/src/main/resources/payara-resource.xml b/src/main/resources/payara-resource.xml
@@ -1,24 +1,21 @@
-<!DOCTYPE resources  PUBLIC  "-//Payara.fish//DTD Payara Server 4 Resource Definitions//EN"
-        "https://raw.githubusercontent.com/payara/Payara-Community-Documentation/master/docs/modules/ROOT/pages/schemas/payara-resources_1_6.dtd">
+<!DOCTYPE resources PUBLIC "-//Payara.fish//DTD Payara Server 4 Resource Definitions//EN"
+        "http://docs.payara.fish/schemas/payara-resources_1_7.dtd">
 <resources>
 
     <jdbc-resource pool-name="PostgresDS"
-                   jndi-name="jdbc/PostgreSQLDS"
-                   enabled="true"/>
+                   jndi-name="jdbc/petclinicDS"
+                   object-type="system-all" enabled="yes"/>
 
-    <jdbc-connection-pool name="DerbyPool"
+    <jdbc-connection-pool name="PostgresDS"
                           res-type="javax.sql.DataSource"
                           driver-classname="org.postgresql.Driver"
                           datasource-classname="org.postgresql.ds.PGConnectionPoolDataSource">
-
         <property name="url" value="jdbc:postgresql://localhost:5432/petclinic_jakartaee_payara"/>
-
         <property name="user" value="petclinic_jakartaee"/>
         <property name="password" value="petclinic_jakartaeepwd"/>
-
         <property name="databaseName" value="petclinic_jakartaee_payara"/>
         <property name="serverName" value="localhost"/>
         <property name="portNumber" value="5432"/>
-
+        <property name="driver" value="petclinic.war_org.postgresql.Driver_42_5"/>
     </jdbc-connection-pool>
 </resources>
diff --git a/src/main/runtimes/payara/resources/META-INF/payara-resource.xml b/src/main/runtimes/payara/resources/META-INF/payara-resource.xml
@@ -0,0 +1,21 @@
+<!DOCTYPE resources PUBLIC "-//Payara.fish//DTD Payara Server 4 Resource Definitions//EN"
+        "http://docs.payara.fish/schemas/payara-resources_1_7.dtd">
+<resources>
+
+    <jdbc-resource pool-name="PostgresDS"
+                   jndi-name="jdbc/petclinicDS"
+                   object-type="system-all" enabled="yes"/>
+
+    <jdbc-connection-pool name="PostgresDS"
+                          res-type="javax.sql.DataSource"
+                          driver-classname="org.postgresql.Driver"
+                          datasource-classname="org.postgresql.ds.PGConnectionPoolDataSource">
+        <property name="url" value="jdbc:postgresql://localhost:5432/petclinic_jakartaee_payara"/>
+        <property name="user" value="petclinic_jakartaee"/>
+        <property name="password" value="petclinic_jakartaeepwd"/>
+        <property name="databaseName" value="petclinic_jakartaee_payara"/>
+        <property name="serverName" value="localhost"/>
+        <property name="portNumber" value="5432"/>
+        <property name="driver" value="petclinic.war_org.postgresql.Driver_42_5"/>
+    </jdbc-connection-pool>
+</resources>
diff --git a/src/main/runtimes/payara/resources/payara-resource.xml b/src/main/runtimes/payara/resources/payara-resource.xml
@@ -0,0 +1,21 @@
+<!DOCTYPE resources PUBLIC "-//Payara.fish//DTD Payara Server 4 Resource Definitions//EN"
+        "http://docs.payara.fish/schemas/payara-resources_1_7.dtd">
+<resources>
+
+    <jdbc-resource pool-name="PostgresDS"
+                   jndi-name="jdbc/petclinicDS"
+                   object-type="system-all" enabled="yes"/>
+
+    <jdbc-connection-pool name="PostgresDS"
+                          res-type="javax.sql.DataSource"
+                          driver-classname="org.postgresql.Driver"
+                          datasource-classname="org.postgresql.ds.PGConnectionPoolDataSource">
+        <property name="url" value="jdbc:postgresql://localhost:5432/petclinic_jakartaee_payara"/>
+        <property name="user" value="petclinic_jakartaee"/>
+        <property name="password" value="petclinic_jakartaeepwd"/>
+        <property name="databaseName" value="petclinic_jakartaee_payara"/>
+        <property name="serverName" value="localhost"/>
+        <property name="portNumber" value="5432"/>
+        <property name="driver" value="petclinic.war_org.postgresql.Driver_42_5"/>
+    </jdbc-connection-pool>
+</resources>
diff --git a/src/main/webapp/META-INF/payara-resource.xml b/src/main/webapp/META-INF/payara-resource.xml
@@ -0,0 +1,21 @@
+<!DOCTYPE resources PUBLIC "-//Payara.fish//DTD Payara Server 4 Resource Definitions//EN"
+        "http://docs.payara.fish/schemas/payara-resources_1_7.dtd">
+<resources>
+
+    <jdbc-resource pool-name="PostgresDS"
+                   jndi-name="jdbc/petclinicDS"
+                   object-type="system-all" enabled="yes"/>
+
+    <jdbc-connection-pool name="PostgresDS"
+                          res-type="javax.sql.DataSource"
+                          driver-classname="org.postgresql.Driver"
+                          datasource-classname="org.postgresql.ds.PGConnectionPoolDataSource">
+        <property name="url" value="jdbc:postgresql://localhost:5432/petclinic_jakartaee_payara"/>
+        <property name="user" value="petclinic_jakartaee"/>
+        <property name="password" value="petclinic_jakartaeepwd"/>
+        <property name="databaseName" value="petclinic_jakartaee_payara"/>
+        <property name="serverName" value="localhost"/>
+        <property name="portNumber" value="5432"/>
+        <property name="driver" value="petclinic.war_org.postgresql.Driver_42_5"/>
+    </jdbc-connection-pool>
+</resources>
diff --git a/src/main/webapp/WEB-INF/payara-resource.xml b/src/main/webapp/WEB-INF/payara-resource.xml
@@ -0,0 +1,21 @@
+<!DOCTYPE resources PUBLIC "-//Payara.fish//DTD Payara Server 4 Resource Definitions//EN"
+        "http://docs.payara.fish/schemas/payara-resources_1_7.dtd">
+<resources>
+
+    <jdbc-resource pool-name="PostgresDS"
+                   jndi-name="jdbc/petclinicDS"
+                   object-type="system-all" enabled="yes"/>
+
+    <jdbc-connection-pool name="PostgresDS"
+                          res-type="javax.sql.DataSource"
+                          driver-classname="org.postgresql.Driver"
+                          datasource-classname="org.postgresql.ds.PGConnectionPoolDataSource">
+        <property name="url" value="jdbc:postgresql://localhost:5432/petclinic_jakartaee_payara"/>
+        <property name="user" value="petclinic_jakartaee"/>
+        <property name="password" value="petclinic_jakartaeepwd"/>
+        <property name="databaseName" value="petclinic_jakartaee_payara"/>
+        <property name="serverName" value="localhost"/>
+        <property name="portNumber" value="5432"/>
+        <property name="driver" value="petclinic.war_org.postgresql.Driver_42_5"/>
+    </jdbc-connection-pool>
+</resources>
diff --git a/src/main/webapp/payara-resource.xml b/src/main/webapp/payara-resource.xml
@@ -0,0 +1,21 @@
+<!DOCTYPE resources PUBLIC "-//Payara.fish//DTD Payara Server 4 Resource Definitions//EN"
+        "http://docs.payara.fish/schemas/payara-resources_1_7.dtd">
+<resources>
+
+    <jdbc-resource pool-name="PostgresDS"
+                   jndi-name="jdbc/petclinicDS"
+                   object-type="system-all" enabled="yes"/>
+
+    <jdbc-connection-pool name="PostgresDS"
+                          res-type="javax.sql.DataSource"
+                          driver-classname="org.postgresql.Driver"
+                          datasource-classname="org.postgresql.ds.PGConnectionPoolDataSource">
+        <property name="url" value="jdbc:postgresql://localhost:5432/petclinic_jakartaee_payara"/>
+        <property name="user" value="petclinic_jakartaee"/>
+        <property name="password" value="petclinic_jakartaeepwd"/>
+        <property name="databaseName" value="petclinic_jakartaee_payara"/>
+        <property name="serverName" value="localhost"/>
+        <property name="portNumber" value="5432"/>
+        <property name="driver" value="petclinic.war_org.postgresql.Driver_42_5"/>
+    </jdbc-connection-pool>
+</resources>