Skip to content

Commit 96ce3e9

Browse files
committed
update to use wildfly-datasources-galleon-pack for database configuration
1 parent f21ba73 commit 96ce3e9

3 files changed

Lines changed: 43 additions & 45 deletions

File tree

batch-processing/add-h2-ds.cli

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
xa-data-source add --name=batch_db --enabled=true --use-java-context=true --use-ccm=true --jndi-name=java:jboss/datasources/batch-processingDS --xa-datasource-properties={"URL"=>"jdbc:h2:mem:batch-processing;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1"} --driver-name=h2 --password=sa --user-name=sa --same-rm-override=false --no-recovery=true

batch-processing/pom.xml

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
<!-- the versions for BOMs, Packs and Plugins -->
5252
<version.bom.ee>${version.server}</version.bom.ee>
5353
<version.plugin.wildfly>5.0.0.Final</version.plugin.wildfly>
54+
<server.test.feature.pack.artifactId>wildfly-ee-galleon-pack</server.test.feature.pack.artifactId>
55+
<server.test.feature.pack.groupId>org.wildfly</server.test.feature.pack.groupId>
56+
<configure.ds.script>${project.basedir}/add-h2-ds.cli</configure.ds.script>
5457
</properties>
5558

5659
<dependencyManagement>
@@ -200,12 +203,26 @@
200203
<groupId>org.wildfly.plugins</groupId>
201204
<artifactId>wildfly-maven-plugin</artifactId>
202205
<configuration>
203-
<discover-provisioning-info>
204-
<version>${version.server}</version>
205-
<addOns>
206-
<addOn>h2-database:default</addOn>
207-
</addOns>
208-
</discover-provisioning-info>
206+
<feature-packs>
207+
<feature-pack>
208+
<groupId>${server.test.feature.pack.groupId}</groupId>
209+
<artifactId>${server.test.feature.pack.artifactId}</artifactId>
210+
<version>${version.server}</version>
211+
</feature-pack>
212+
<feature-pack>
213+
<location>org.wildfly:wildfly-datasources-galleon-pack:8.0.1.Final</location>
214+
</feature-pack>
215+
</feature-packs>
216+
<layers>
217+
<layer>core-tools</layer>
218+
<layer>batch-jberet</layer>
219+
<layer>h2-driver</layer>
220+
<layer>jaxrs-server</layer>
221+
<layer>jsf</layer>
222+
</layers>
223+
<scripts>
224+
<script>${configure.ds.script}</script>
225+
</scripts>
209226
<!--
210227
Rename the output war to ROOT.war before adding it to the server, so that the
211228
application is deployed in the root web context.
@@ -214,8 +231,26 @@
214231
</configuration>
215232
<executions>
216233
<execution>
234+
<id>server-provisioning</id>
235+
<phase>generate-test-resources</phase>
217236
<goals>
218-
<goal>package</goal>
237+
<goal>provision</goal>
238+
</goals>
239+
</execution>
240+
<execution>
241+
<id>wildfly-start</id>
242+
<phase>pre-integration-test</phase>
243+
<goals>
244+
<goal>start</goal>
245+
<goal>execute-commands</goal>
246+
<goal>deploy</goal>
247+
</goals>
248+
</execution>
249+
<execution>
250+
<phase>post-integration-test</phase>
251+
<id>wildfly-stop</id>
252+
<goals>
253+
<goal>shutdown</goal>
219254
</goals>
220255
</execution>
221256
</executions>

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)