Skip to content

Commit e78dafb

Browse files
committed
[WFLY-19790] batch-processing: replaces -ds.xml deprecated filed with Jakarta's DataSourceDefinition
1 parent 2fac08e commit e78dafb

3 files changed

Lines changed: 23 additions & 40 deletions

File tree

batch-processing/pom.xml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,20 @@
191191
</plugin>
192192
</plugins>
193193
</pluginManagement>
194+
<plugins>
195+
<plugin>
196+
<groupId>org.apache.maven.plugins</groupId>
197+
<artifactId>maven-war-plugin</artifactId>
198+
<configuration>
199+
<archive>
200+
<manifestEntries>
201+
<!-- specifies that the deployment depends on server module com.h2database.h2 -->
202+
<Dependencies>com.h2database.h2</Dependencies>
203+
</manifestEntries>
204+
</archive>
205+
</configuration>
206+
</plugin>
207+
</plugins>
194208
</build>
195209

196210
<profiles>
@@ -208,7 +222,7 @@
208222
<discover-provisioning-info>
209223
<version>${version.server}</version>
210224
<addOns>
211-
<addOn>h2-database:default</addOn>
225+
<addOn>h2-database</addOn>
212226
</addOns>
213227
</discover-provisioning-info>
214228
</configuration>
@@ -235,7 +249,7 @@
235249
<version>${version.server}</version>
236250
<context>cloud</context>
237251
<addOns>
238-
<addOn>h2-database:default</addOn>
252+
<addOn>h2-database</addOn>
239253
</addOns>
240254
</discover-provisioning-info>
241255
</configuration>

batch-processing/src/main/java/org/jboss/as/quickstarts/batch/model/Contact.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,18 @@
1616
*/
1717
package org.jboss.as.quickstarts.batch.model;
1818

19+
import jakarta.annotation.sql.DataSourceDefinition;
1920
import jakarta.persistence.Column;
2021
import jakarta.persistence.Entity;
2122
import jakarta.persistence.Id;
2223
import jakarta.validation.constraints.NotNull;
2324

25+
@DataSourceDefinition(name="java:jboss/datasources/batch-processingDS",
26+
className="org.h2.jdbcx.JdbcDataSource",
27+
url="jdbc:h2:mem:batch-processing;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1",
28+
user="sa",
29+
password="sa"
30+
)
2431
@Entity
2532
public class Contact {
2633

batch-processing/src/main/webapp/WEB-INF/jboss-batch-processing-ds.xml

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)