From 846bbed7ee87568817616f7df3480dbd4b403fa2 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@goolemail.com>
Date: Sun, 14 Jun 2020 18:49:08 +0200
Subject: [PATCH] Added wildfly-maven-plugin to ccm-bundle-devel-wildfly-web

Former-commit-id: 9c1af3188334429a01974d112f4b5e5c936bcab8
---
 ccm-bundle-devel-wildfly-web/pom.xml | 54 ++++++++++++++++++++--------
 pom.xml                              |  2 +-
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml
index 280cd2476..db6b2455a 100644
--- a/ccm-bundle-devel-wildfly-web/pom.xml
+++ b/ccm-bundle-devel-wildfly-web/pom.xml
@@ -222,7 +222,9 @@
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-maven-plugin</artifactId>
                 <configuration>
-                    <skip>true</skip>
+                    <commands>
+                        <command>/subsystem=datasources/data-source=ccm-devel:add(driver-name=postgresql,jndi-name="java:/comp/env/jdbc/libreccm/db",connection-url="${wildfly.datasource.connectionUrl}",user-name="${wildfly.datasource.username}",password="${wildfly.datasource.password}",use-ccm="false")</command>
+                    </commands>
                 </configuration>
             </plugin>-->
         </plugins>
@@ -243,7 +245,7 @@
                         <groupId>org.wildfly.plugins</groupId>
                         <artifactId>wildfly-maven-plugin</artifactId>
                         <executions>
-                            <execution>
+                            <!--                            <execution>
                                 <id>undeploy</id>
                                 <phase>clean</phase>
                                 <goals>
@@ -252,13 +254,16 @@
                                 <configuration>
                                     <ignoreMissingDeployment>true</ignoreMissingDeployment>
                                 </configuration>
-                            </execution>
+                            </execution>-->
                             <execution>
                                 <id>start</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>start</goal>
                                 </goals>
+                                <configuration>
+                                    <stdout>System.out</stdout>
+                                </configuration>
                             </execution>
                             <execution>
                                 <id>deploy-jdbc-driver</id>
@@ -274,22 +279,41 @@
                             </execution>
                             <execution>
                                 <id>add-datasource</id>
-                                <phase>install</phase>
+                                <phase>package</phase>
                                 <configuration>
                                     <address>subsystem=datasources,data-source=ccm-devel</address>
-                                    <properties>
-                                        <connection-url>${wildfly.datasource.connectionUrl}</connection-url>
-                                        <jndi-name>java:/comp/env/jdbc/libreccm/db</jndi-name>
-                                        <enabled>true</enabled>
-                                        <username>${wildfly.datasource.username}</username>
-                                        <password>${wildfly.datasource.password}</password>
-                                        <use-ccm>false</use-ccm>
-                                    </properties>
+                                    <resources>
+                                        <resource>
+                                            <!--<enableResource>true</enableResource>-->
+                                            <properties>
+                                                <connection-url>${wildfly.datasource.connectionUrl}</connection-url>
+                                                <jndi-name>java:/comp/env/jdbc/libreccm/db</jndi-name>
+                                                <enabled>true</enabled>
+                                                <user-name>${wildfly.datasource.username}</user-name>
+                                                <password>${wildfly.datasource.password}</password>
+                                                <use-ccm>false</use-ccm>
+                                                <driver-name>postgresql.jar</driver-name>
+                                            </properties>
+                                        </resource>
+                                    </resources>
+                                   
                                 </configuration>
                                 <goals>
                                     <goal>add-resource</goal>
                                 </goals>
                             </execution>
+                            <!--                                                        <execution>
+                                <id>run</id>
+                                <phase>package</phase>
+                                <configuration>
+                                    <commands>
+                                        <command>/subsystem=datasources/data-source=ccm-devel:add(driver-name=postgresql,jndi-name="java:/comp/env/jdbc/libreccm/db",connection-url="${wildfly.datasource.connectionUrl}",user-name="${wildfly.datasource.username}",password="${wildfly.datasource.password}",use-ccm="false")</command>
+                                    </commands>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>-->
                             <!--                            <execution>
                                 <id>run</id>
                                 <phase>package</phase>
@@ -297,14 +321,14 @@
                                     <goal>run</goal>
                                 </goals>
                             </execution>-->
-                            <!--                            <execution>
+                            <execution>
                                 <id>deploy</id>
                                 <phase>package</phase>
                                 <goals>
-                                    <goal>deploy</goal>
+                                    <goal>deploy-only</goal>
                                 </goals>
                             </execution>
-                            <execution>
+                            <!--<execution>
                                 <id>start</id>
                                 <phase>package</phase>
                                 <goals>
diff --git a/pom.xml b/pom.xml
index 9a2264509..2430a0755 100644
--- a/pom.xml
+++ b/pom.xml
@@ -329,7 +329,7 @@
                 <plugin>
                     <groupId>org.wildfly.plugins</groupId>
                     <artifactId>wildfly-maven-plugin</artifactId>
-                    <version>2.0.2.Final</version>
+                    <version>2.1.0.Beta1</version>
                 </plugin>
             </plugins>
         </pluginManagement>