Merge pull request #12312 from dkapil/task/JAVA-12424

Task/java 12424
2022-06-08 15:46:00 +03:00 · 2022-06-08 15:46:00 +03:00 · 220f50f2e2
parent e5abd570f7 ac3a407f6d
commit 220f50f2e2
82 changed files with 12 additions and 12 deletions
--- a/pom.xml
+++ b/pom.xml
@ -626,7 +626,7 @@
                <module>spring-di-3</module>
                <module>spring-drools</module>

-                <module>spring-ejb</module>
+                <module>spring-ejb-modules</module>
                <module>spring-exceptions</module>

                <module>spring-freemarker</module>
@ -746,7 +746,7 @@
                <module>libraries-6</module>

                <module>spring-boot-modules/spring-boot-react</module>
-                <module>spring-ejb/ejb-beans</module>
+                <module>spring-ejb-modules/ejb-beans</module>

                <module>vaadin</module>
                <module>vavr</module>
@ -1076,7 +1076,7 @@
                <module>spring-di-3</module>
                <module>spring-drools</module>

-                <module>spring-ejb</module>
+                <module>spring-ejb-modules</module>
                <module>spring-exceptions</module>

                <module>spring-freemarker</module>
@ -1189,7 +1189,7 @@
                <module>libraries-6</module>

                <module>spring-boot-modules/spring-boot-react</module>
-                <module>spring-ejb/ejb-beans</module>
+                <module>spring-ejb-modules/ejb-beans</module>

                <module>vaadin</module>
                <module>vavr</module>
--- a/spring-ejb-modules/README.md
+++ b/spring-ejb-modules/README.md
--- a/spring-ejb-modules/ejb-beans/README.md
+++ b/spring-ejb-modules/ejb-beans/README.md
--- a/spring-ejb-modules/ejb-beans/pom.xml
+++ b/spring-ejb-modules/ejb-beans/pom.xml
@ -9,7 +9,7 @@

    <parent>
        <groupId>com.baeldung.spring.ejb</groupId>
-        <artifactId>spring-ejb</artifactId>
+        <artifactId>spring-ejb-modules</artifactId>
        <version>1.0.0-SNAPSHOT</version>
    </parent>

--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient1.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/EJBClient2.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateful/StatefulEJB.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient1.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/EJBClient2.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejb/stateless/StatelessEJB.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/messagedriven/RecieverMDB.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/messagedriven/RecieverMDB.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJB.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJB.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJBRemote.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/singleton/CounterEJBRemote.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJB.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJB.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJBRemote.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateful/ShoppingCartEJBRemote.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJB.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJB.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJBRemote.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/ejb/stateless/FinderEJBRemote.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/config/ApplicationConfig.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/config/ApplicationConfig.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Producer.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Producer.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Receiver.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/messagedriven/Receiver.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/singleton/CounterBean.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/singleton/CounterBean.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/stateful/ShoppingCartBean.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/ejbspringcomparison/spring/stateful/ShoppingCartBean.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryState.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryState.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateBeanManagedBean.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateBeanManagedBean.java
--- a/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateContainerManagedBean.java
+++ b/spring-ejb-modules/ejb-beans/src/main/java/com/baeldung/singletonbean/CountryStateContainerManagedBean.java
--- a/spring-ejb-modules/ejb-beans/src/main/resources/logback.xml
+++ b/spring-ejb-modules/ejb-beans/src/main/resources/logback.xml
--- a/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejb/stateful/StatefulEJBIntegrationTest.java
+++ b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejb/stateful/StatefulEJBIntegrationTest.java
--- a/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejb/stateless/StatelessEJBIntegrationTest.java
+++ b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejb/stateless/StatelessEJBIntegrationTest.java
--- a/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/ejb/EJBUnitTest.java
+++ b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/ejb/EJBUnitTest.java
--- a/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/spring/SpringUnitTest.java
+++ b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/ejbspringcomparison/spring/SpringUnitTest.java
--- a/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/singletonbean/CountryStateCacheBeanUnitTest.java
+++ b/spring-ejb-modules/ejb-beans/src/test/java/com/baeldung/singletonbean/CountryStateCacheBeanUnitTest.java
--- a/spring-ejb-modules/ejb-beans/src/test/resources/arquillian.xml
+++ b/spring-ejb-modules/ejb-beans/src/test/resources/arquillian.xml
--- a/spring-ejb-modules/ejb-beans/src/test/resources/logging.properties
+++ b/spring-ejb-modules/ejb-beans/src/test/resources/logging.properties
--- a/spring-ejb-modules/pom.xml
+++ b/spring-ejb-modules/pom.xml
@ -4,9 +4,9 @@
    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.spring.ejb</groupId>
-    <artifactId>spring-ejb</artifactId>
+    <artifactId>spring-ejb-modules</artifactId>
    <version>1.0.0-SNAPSHOT</version>
-    <name>spring-ejb</name>
+    <name>spring-ejb-modules</name>
    <packaging>pom</packaging>
    <description>Spring EJB Tutorial</description>

@ -24,7 +24,7 @@

    <dependencyManagement>
        <dependencies>
-            <!-- for junit5 to successfully be able to discover junit4 tests, we need 4.12+ version of 
+            <!-- for junit5 to successfully be able to discover junit4 tests, we need 4.12+ version of
                junit:junit in the classpath. hence forcing the latest 4.13.2 available version for junit5 compatibility -->
            <dependency>
                <groupId>junit</groupId>
@ -93,4 +93,4 @@
        <ejb.version>3.2</ejb.version>
    </properties>

-</project>
+</project>
--- a/spring-ejb-modules/spring-ejb-client/README.md
+++ b/spring-ejb-modules/spring-ejb-client/README.md
--- a/spring-ejb-modules/spring-ejb-client/pom.xml
+++ b/spring-ejb-modules/spring-ejb-client/pom.xml
@ -10,7 +10,7 @@

    <parent>
        <groupId>com.baeldung.spring.ejb</groupId>
-        <artifactId>spring-ejb</artifactId>
+        <artifactId>spring-ejb-modules</artifactId>
        <version>1.0.0-SNAPSHOT</version>
    </parent>

--- a/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java
+++ b/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/ejb/client/EJBClient.java
--- a/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/ejb/wildfly/TextApplication.java
+++ b/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/ejb/wildfly/TextApplication.java
--- a/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/springejbclient/SpringEjbClientApplication.java
+++ b/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/springejbclient/SpringEjbClientApplication.java
--- a/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/springejbclient/endpoint/HomeEndpoint.java
+++ b/spring-ejb-modules/spring-ejb-client/src/main/java/com/baeldung/springejbclient/endpoint/HomeEndpoint.java
--- a/spring-ejb-modules/spring-ejb-client/src/main/resources/application.properties
+++ b/spring-ejb-modules/spring-ejb-client/src/main/resources/application.properties
--- a/spring-ejb-modules/spring-ejb-client/src/main/resources/jboss-ejb-client.properties
+++ b/spring-ejb-modules/spring-ejb-client/src/main/resources/jboss-ejb-client.properties
--- a/spring-ejb-modules/spring-ejb-client/src/main/resources/logback.xml
+++ b/spring-ejb-modules/spring-ejb-client/src/main/resources/logback.xml
--- a/spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/SpringContextLiveTest.java
+++ b/spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/SpringContextLiveTest.java
--- a/spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupLiveTest.java
+++ b/spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupLiveTest.java
--- a/spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/ejb/wildfly/TextApplicationLiveTest.java
+++ b/spring-ejb-modules/spring-ejb-client/src/test/java/com/baeldung/ejb/wildfly/TextApplicationLiveTest.java
--- a/spring-ejb-modules/spring-ejb-remote/README.md
+++ b/spring-ejb-modules/spring-ejb-remote/README.md
--- a/spring-ejb-modules/spring-ejb-remote/pom.xml
+++ b/spring-ejb-modules/spring-ejb-remote/pom.xml
@ -9,7 +9,7 @@

    <parent>
        <groupId>com.baeldung.spring.ejb</groupId>
-        <artifactId>spring-ejb</artifactId>
+        <artifactId>spring-ejb-modules</artifactId>
        <version>1.0.0-SNAPSHOT</version>
    </parent>

--- a/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorld.java
+++ b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorld.java
--- a/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorldBean.java
+++ b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorldBean.java
--- a/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorld.java
+++ b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorld.java
--- a/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorldBean.java
+++ b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorldBean.java
--- a/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorld.java
+++ b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorld.java
--- a/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java
+++ b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/tutorial/HelloWorldBean.java
--- a/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorBean.java
+++ b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorBean.java
--- a/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorRemote.java
+++ b/spring-ejb-modules/spring-ejb-remote/src/main/java/com/baeldung/ejb/wildfly/TextProcessorRemote.java
--- a/spring-ejb-modules/spring-ejb-remote/src/main/resources/META-INF/ejb-jar.xml
+++ b/spring-ejb-modules/spring-ejb-remote/src/main/resources/META-INF/ejb-jar.xml
--- a/spring-ejb-modules/spring-ejb-remote/src/main/resources/logback.xml
+++ b/spring-ejb-modules/spring-ejb-remote/src/main/resources/logback.xml
--- a/spring-ejb-modules/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatefulWorldTestUnitTest.java
+++ b/spring-ejb-modules/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatefulWorldTestUnitTest.java
--- a/spring-ejb-modules/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatelessWorldTestUnitTest.java
+++ b/spring-ejb-modules/spring-ejb-remote/src/test/java/com/baeldung/ejb/tutorial/HelloStatelessWorldTestUnitTest.java
--- a/spring-ejb-modules/wildfly/pom.xml
+++ b/spring-ejb-modules/wildfly/pom.xml
@ -11,7 +11,7 @@

    <parent>
        <groupId>com.baeldung.spring.ejb</groupId>
-        <artifactId>spring-ejb</artifactId>
+        <artifactId>spring-ejb-modules</artifactId>
        <version>1.0.0-SNAPSHOT</version>
    </parent>

--- a/spring-ejb-modules/wildfly/widlfly-web/pom.xml
+++ b/spring-ejb-modules/wildfly/widlfly-web/pom.xml
--- a/spring-ejb-modules/wildfly/widlfly-web/src/main/java/TestEJBServlet.java
+++ b/spring-ejb-modules/wildfly/widlfly-web/src/main/java/TestEJBServlet.java
--- a/spring-ejb-modules/wildfly/widlfly-web/src/main/java/TestJPAServlet.java
+++ b/spring-ejb-modules/wildfly/widlfly-web/src/main/java/TestJPAServlet.java
--- a/spring-ejb-modules/wildfly/widlfly-web/src/main/resources/logback.xml
+++ b/spring-ejb-modules/wildfly/widlfly-web/src/main/resources/logback.xml
--- a/spring-ejb-modules/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml
+++ b/spring-ejb-modules/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml
--- a/spring-ejb-modules/wildfly/wildfly-ear/pom.xml
+++ b/spring-ejb-modules/wildfly/wildfly-ear/pom.xml
--- a/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/pom.xml
+++ b/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/pom.xml
--- a/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java
+++ b/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java
--- a/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java
+++ b/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java
--- a/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/resources/logback.xml
+++ b/spring-ejb-modules/wildfly/wildfly-ejb-interfaces/src/main/resources/logback.xml
--- a/spring-ejb-modules/wildfly/wildfly-ejb/pom.xml
+++ b/spring-ejb-modules/wildfly/wildfly-ejb/pom.xml
--- a/spring-ejb-modules/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java
+++ b/spring-ejb-modules/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java
--- a/spring-ejb-modules/wildfly/wildfly-ejb/src/main/resources/logback.xml
+++ b/spring-ejb-modules/wildfly/wildfly-ejb/src/main/resources/logback.xml
--- a/spring-ejb-modules/wildfly/wildfly-jpa/pom.xml
+++ b/spring-ejb-modules/wildfly/wildfly-jpa/pom.xml
--- a/spring-ejb-modules/wildfly/wildfly-jpa/src/main/java/model/User.java
+++ b/spring-ejb-modules/wildfly/wildfly-jpa/src/main/java/model/User.java
--- a/spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml
+++ b/spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml
--- a/spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/data.sql
+++ b/spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/data.sql
--- a/spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/logback.xml
+++ b/spring-ejb-modules/wildfly/wildfly-jpa/src/main/resources/logback.xml
--- a/spring-ejb-modules/wildfly/wildfly-mdb/pom.xml
+++ b/spring-ejb-modules/wildfly/wildfly-mdb/pom.xml
--- a/spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java
+++ b/spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/ReadMessageMDB.java
--- a/spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java
+++ b/spring-ejb-modules/wildfly/wildfly-mdb/src/com/baeldung/wildfly/mdb/SendMessageServlet.java