From 02a680c9d6436c8830604b8a0dd8e717a4d19816 Mon Sep 17 00:00:00 2001
From: Ehsan Sasanianno <ehsan.sasanian@gmail.com>
Date: Sun, 3 Sep 2023 10:50:29 +0200
Subject: [PATCH] java-18762: move wildfly-mdb module to spring-ejb-modules
 (#14680)

---
 spring-ejb-modules/pom.xml                    |  3 +-
 .../{wildfly => }/wildfly-mdb/README.md       |  0
 .../{wildfly => }/wildfly-mdb/pom.xml         |  6 +-
 .../baeldung/wildfly/mdb/ReadMessageMDB.java  |  0
 .../wildfly/mdb/SendMessageServlet.java       |  0
 spring-ejb-modules/wildfly/pom.xml            | 89 -------------------
 6 files changed, 5 insertions(+), 93 deletions(-)
 rename spring-ejb-modules/{wildfly => }/wildfly-mdb/README.md (100%)
 rename spring-ejb-modules/{wildfly => }/wildfly-mdb/pom.xml (81%)
 rename spring-ejb-modules/{wildfly => }/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java (100%)
 rename spring-ejb-modules/{wildfly => }/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java (100%)
 delete mode 100644 spring-ejb-modules/wildfly/pom.xml

diff --git a/spring-ejb-modules/pom.xml b/spring-ejb-modules/pom.xml
index c5d04dab25..1b6c0ffc30 100755
--- a/spring-ejb-modules/pom.xml
+++ b/spring-ejb-modules/pom.xml
@@ -20,7 +20,7 @@
         <!--<module>ejb-beans</module> JAVA-22440 need to upgrade to java 17 -->
         <module>spring-ejb-remote</module>
         <module>spring-ejb-client</module>
-        <module>wildfly</module>
+        <module>wildfly-mdb</module>
     </modules>
 
     <dependencyManagement>
@@ -76,6 +76,7 @@
         <wildfly-ejb.version>12.0.0.Final</wildfly-ejb.version>
         <maven-ejb-plugin.version>2.4</maven-ejb-plugin.version>
         <ejb.version>3.2</ejb.version>
+        <javaee-api.version>7.0</javaee-api.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-ejb-modules/wildfly/wildfly-mdb/README.md b/spring-ejb-modules/wildfly-mdb/README.md
similarity index 100%
rename from spring-ejb-modules/wildfly/wildfly-mdb/README.md
rename to spring-ejb-modules/wildfly-mdb/README.md
diff --git a/spring-ejb-modules/wildfly/wildfly-mdb/pom.xml b/spring-ejb-modules/wildfly-mdb/pom.xml
similarity index 81%
rename from spring-ejb-modules/wildfly/wildfly-mdb/pom.xml
rename to spring-ejb-modules/wildfly-mdb/pom.xml
index 0784725cde..7498379ef9 100644
--- a/spring-ejb-modules/wildfly/wildfly-mdb/pom.xml
+++ b/spring-ejb-modules/wildfly-mdb/pom.xml
@@ -7,9 +7,9 @@
     <name>wildfly-mdb</name>
 
     <parent>
-        <groupId>com.baeldung.wildfly</groupId>
-        <artifactId>wildfly</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <groupId>com.baeldung.spring.ejb</groupId>
+        <artifactId>spring-ejb-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java b/spring-ejb-modules/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java
similarity index 100%
rename from spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java
rename to spring-ejb-modules/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java
diff --git a/spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java b/spring-ejb-modules/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java
similarity index 100%
rename from spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java
rename to spring-ejb-modules/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java
diff --git a/spring-ejb-modules/wildfly/pom.xml b/spring-ejb-modules/wildfly/pom.xml
deleted file mode 100644
index 412fa1b244..0000000000
--- a/spring-ejb-modules/wildfly/pom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung.wildfly</groupId>
-    <artifactId>wildfly</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>wildfly</name>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>com.baeldung.spring.ejb</groupId>
-        <artifactId>spring-ejb-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <modules>
-        <module>wildfly-mdb</module>
-    </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- Dependencies for other libraries -->
-            <!-- Dependency for java ee -->
-            <dependency>
-                <groupId>javax</groupId>
-                <artifactId>javaee-api</artifactId>
-                <version>${javaee-api.version}</version>
-                <scope>provided</scope>
-            </dependency>
-            <!-- Dependency for wildfly -->
-            <dependency>
-                <groupId>org.wildfly.bom</groupId>
-                <artifactId>wildfly-javaee7</artifactId>
-                <version>${wildfly-javaee7.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <!-- Dependency on Hibernate -->
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-core</artifactId>
-                <version>${hibernate-core.version}</version>
-                <scope>provided</scope>
-            </dependency>
-            <!-- Dependency for ear module -->
-            <dependency>
-                <groupId>com.baeldung.wildfly</groupId>
-                <artifactId>wildlfy-ear</artifactId>
-                <version>${wildlfy.version}</version>
-                <type>ear</type>
-            </dependency>
-            <!-- Dependency for web module -->
-            <dependency>
-                <groupId>com.baeldung.wildfly</groupId>
-                <artifactId>wildlfy-web</artifactId>
-                <version>${wildlfy.version}</version>
-                <type>war</type>
-            </dependency>
-            <!-- Dependency for jpa module -->
-            <dependency>
-                <groupId>com.baeldung.wildfly</groupId>
-                <artifactId>wildlfy-jpa</artifactId>
-                <version>${wildlfy.version}</version>
-            </dependency>
-            <!-- Dependency for EJB -->
-            <dependency>
-                <groupId>com.baeldung.wildfly</groupId>
-                <artifactId>wildfly-ejb</artifactId>
-                <version>${wildlfy.version}</version>
-            </dependency>
-            <!-- Dependency for EJB interfaces -->
-            <dependency>
-                <groupId>com.baeldung.wildfly</groupId>
-                <artifactId>wildfly-ejb-interfaces</artifactId>
-                <version>${wildlfy.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <properties>
-        <javaee-api.version>7.0</javaee-api.version>
-        <wildfly-javaee7.version>10.1.0.Final</wildfly-javaee7.version>
-        <hibernate-core.version>5.2.3.Final</hibernate-core.version>
-        <wildlfy.version>0.0.1-SNAPSHOT</wildlfy.version>
-    </properties>
-
-</project>
\ No newline at end of file