update to use wildfly-datasources-galleon-pack for database configura…

…tion
wildfly · Oct 30, 2024 · 96ce3e9 · 96ce3e9
1 parent f21ba73
commit 96ce3e9
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 45 deletions.
diff --git a/batch-processing/add-h2-ds.cli b/batch-processing/add-h2-ds.cli
@@ -0,0 +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
diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml
@@ -51,6 +51,9 @@
         <!-- the versions for BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
         <version.plugin.wildfly>5.0.0.Final</version.plugin.wildfly>
+        <server.test.feature.pack.artifactId>wildfly-ee-galleon-pack</server.test.feature.pack.artifactId>
+        <server.test.feature.pack.groupId>org.wildfly</server.test.feature.pack.groupId>
+        <configure.ds.script>${project.basedir}/add-h2-ds.cli</configure.ds.script>
     </properties>
 
     <dependencyManagement>
@@ -200,12 +203,26 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <configuration>
-                            <discover-provisioning-info>
-                                <version>${version.server}</version>
-                                <addOns>
-                                    <addOn>h2-database:default</addOn>
-                                </addOns>
-                            </discover-provisioning-info>
+                            <feature-packs>
+                                <feature-pack>
+                                    <groupId>${server.test.feature.pack.groupId}</groupId>
+                                    <artifactId>${server.test.feature.pack.artifactId}</artifactId>
+                                    <version>${version.server}</version>
+                                </feature-pack>
+                                <feature-pack>
+                                    <location>org.wildfly:wildfly-datasources-galleon-pack:8.0.1.Final</location>
+                                </feature-pack>
+                            </feature-packs>
+                            <layers>
+                                <layer>core-tools</layer>
+                                <layer>batch-jberet</layer>
+                                <layer>h2-driver</layer>
+                                <layer>jaxrs-server</layer>
+                                <layer>jsf</layer>
+                            </layers>
+                            <scripts>
+                                <script>${configure.ds.script}</script>
+                            </scripts>
                             <!--
                                 Rename the output war to ROOT.war before adding it to the server, so that the
                                 application is deployed in the root web context.
@@ -214,8 +231,26 @@
                         </configuration>
                         <executions>
                             <execution>
+                                <id>server-provisioning</id>
+                                <phase>generate-test-resources</phase>
                                 <goals>
-                                    <goal>package</goal>
+                                    <goal>provision</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>wildfly-start</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                    <goal>execute-commands</goal>
+                                    <goal>deploy</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <phase>post-integration-test</phase>
+                                <id>wildfly-stop</id>
+                                <goals>
+                                    <goal>shutdown</goal>
                                 </goals>
                             </execution>
                         </executions>

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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +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