From 20375e9730893d7d3f66bd81eab5db3083839b51 Mon Sep 17 00:00:00 2001
From: Eduardo Martins <emartins@redhat.com>
Date: Wed, 30 Oct 2024 19:28:07 +0000
Subject: [PATCH] [WFLY-19790] Replaces -ds.xml deprecated filed with Jakarta's
 DataSourceDefinition

---
 batch-processing/pom.xml                      | 19 +++++++++-
 .../as/quickstarts/batch/model/Contact.java   |  8 ++++
 .../WEB-INF/jboss-batch-processing-ds.xml     | 38 -------------------
 bmt/README-source.adoc                        | 12 ------
 4 files changed, 25 insertions(+), 52 deletions(-)
 delete mode 100644 batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml

diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
index 7045419b84..9e62901139 100644
--- 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
index 41efad1b0c..1ab2b6b166 100644
--- 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
deleted file mode 100644
index fb23f37023..0000000000
--- a/batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    JBoss, Home of Professional Open Source
-    Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
-    contributors by the @authors tag. See the copyright.txt in the
-    distribution for a full listing of individual contributors.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!-- This is an unmanaged datasource. It should be used for proofs of concept
-    or testing only. It uses H2, an in memory database that ships with JBoss
-    AS. -->
-<datasources xmlns="http://www.jboss.org/ironjacamar/schema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.jboss.org/ironjacamar/schema http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
-    <!-- The datasource is bound into JNDI at this location. We reference
-        this in META-INF/persistence.xml -->
-    <datasource jndi-name="java:jboss/datasources/batch-processingDS"
-        pool-name="jboss-batch-processing" enabled="true"
-        use-java-context="true">
-        <connection-url>jdbc:h2:mem:batch-processing;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1</connection-url>
-        <driver>h2</driver>
-        <security>
-            <user-name>sa</user-name>
-            <password>sa</password>
-        </security>
-    </datasource>
-</datasources>
-
diff --git a/bmt/README-source.adoc b/bmt/README-source.adoc
index a884f8da42..0a0e116288 100644
--- 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