[WFLY-19790] Replaces -ds.xml deprecated filed with Jakarta's DataSou…

…rceDefinition
wildfly · Oct 30, 2024 · 20375e9 · 20375e9
1 parent de97aa6
commit 20375e9
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 52 deletions.
diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
@@ -191,6 +191,19 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Dependencies>com.h2database.h2</Dependencies>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <profiles>
@@ -205,8 +218,9 @@
                             <discover-provisioning-info>
                                 <version>${version.server}</version>
                                 <addOns>
-                                    <addOn>h2-database:default</addOn>
+                                    <addOn>h2-database</addOn>
                                 </addOns>
+                                <failsOnError>false</failsOnError>
                             </discover-provisioning-info>
                         </configuration>
                         <executions>
@@ -232,8 +246,9 @@
                                 <version>${version.server}</version>
                                 <context>cloud</context>
                                 <addOns>
-                                    <addOn>h2-database:default</addOn>
+                                    <addOn>h2-database</addOn>
                                 </addOns>
+                                <failsOnError>false</failsOnError>
                             </discover-provisioning-info>
                         </configuration>
                         <executions>

diff --git a/batch-processing/src/main/java/org/jboss/as/quickstarts/batch/model/Contact.java b/batch-processing/src/main/java/org/jboss/as/quickstarts/batch/model/Contact.java
@@ -16,12 +16,20 @@
  */
 package org.jboss.as.quickstarts.batch.model;
 
+import jakarta.annotation.sql.DataSourceDefinition;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.validation.constraints.NotNull;
 
+
 @Entity
+@DataSourceDefinition(name="java:jboss/datasources/batch-processingDS",
+        className="org.h2.jdbcx.JdbcDataSource",
+        url="jdbc:h2:mem:batch-processing;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1",
+        user="sa",
+        password="sa"
+)
 public class Contact {
 
     @Id

diff --git a/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml b/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml
diff --git a/bmt/README-source.adoc b/bmt/README-source.adoc
@@ -12,7 +12,6 @@ The `bmt` quickstart demonstrates Bean-Managed Transactions (BMT), showing how t
 :standalone-server-type: default
 :archiveType: war
 :uses-h2:
-:uses-ds-xml:
 :performance-scalability:
 
 == What is it?
@@ -53,17 +52,6 @@ You are presented with a simple form for adding key/value pairs, and a checkbox
 . To add or update the value of a key, fill in the *Key* and *Value* input fields.
 . Click the *Submit* button to see the results.
 
-== Server Log: Expected Warnings and Errors
-
-You will see the following warnings in the server log. You can ignore these warnings.
-
-[source,options="nowrap"]
-----
-WFLYJCA0091: -ds.xml file deployments are deprecated. Support may be removed in a future version.
-
-HHH000431: Unable to determine H2 database version, certain features may not work
-----
-
 // Server Distribution Testing
 include::../shared-doc/run-integration-tests-with-server-distribution.adoc[leveloffset=+1]
 // Undeploy the Quickstart