From 398e32e75a90cfb12a7ea973da3cb98064413ade Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Thu, 24 Nov 2022 20:19:58 +0530 Subject: [PATCH 1/2] JAVA-15787 Created new di-modules and server-modules - Moved spring-freemarker to spring-web-modules --- {cdi => di-modules/cdi}/README.md | 0 {cdi => di-modules/cdi}/pom.xml | 3 +-- .../application/BootstrappingApplication.java | 0 .../cdi2observers/events/ExampleEvent.java | 0 .../events/ExampleEventSource.java | 0 .../AnotherExampleEventObserver.java | 0 .../observers/ExampleEventObserver.java | 0 .../cdi2observers/services/TextService.java | 0 .../application/FileApplication.java | 0 .../factories/TimeLoggerFactory.java | 0 .../imagefileeditors/GifFileEditor.java | 0 .../imagefileeditors/ImageFileEditor.java | 0 .../imagefileeditors/JpgFileEditor.java | 0 .../imagefileeditors/PngFileEditor.java | 0 .../imageprocessors/ImageFileProcessor.java | 0 .../loggers/TimeLogger.java | 0 .../qualifiers/GifFileEditorQualifier.java | 0 .../qualifiers/JpgFileEditorQualifier.java | 0 .../qualifiers/PngFileEditorQualifier.java | 0 .../com/baeldung/interceptor/Audited.java | 0 .../interceptor/AuditedInterceptor.java | 0 .../com/baeldung/service/SuperService.java | 0 .../spring/aspect/SpringTestAspect.java | 0 .../spring/configuration/AppConfig.java | 0 .../spring/service/SpringSuperService.java | 0 .../src/main/resources/META-INF/beans.xml | 0 .../cdi}/src/main/resources/logback.xml | 0 .../test/InterceptorIntegrationTest.java | 0 .../SpringInterceptorIntegrationTest.java | 0 .../tests/TextServiceUnitTest.java | 0 .../GifFileEditorUnitTest.java | 0 .../ImageProcessorUnitTest.java | 0 .../JpgFileEditorUnitTest.java | 0 .../PngFileEditorUnitTest.java | 0 .../TimeLoggerFactoryUnitTest.java | 0 .../TimeLoggerUnitTest.java | 0 {dagger => di-modules/dagger}/README.md | 0 {dagger => di-modules/dagger}/pom.xml | 4 ++-- .../java/com/baeldung/dagger/intro/Brand.java | 0 .../java/com/baeldung/dagger/intro/Car.java | 0 .../com/baeldung/dagger/intro/Engine.java | 0 .../dagger/intro/VehiclesComponent.java | 0 .../baeldung/dagger/intro/VehiclesModule.java | 0 .../dagger}/src/main/resources/logback.xml | 0 .../baeldung/dagger/intro/DaggerUnitTest.java | 0 .../flyway-cdi-extension}/README.md | 0 .../flyway-cdi-extension}/pom.xml | 5 ++-- .../cdi/extension/FlywayExtension.java | 0 .../baeldung/cdi/extension/FlywayType.java | 0 .../com/baeldung/cdi/extension/MainApp.java | 0 .../src/main/resources/META-INF/beans.xml | 0 .../javax.enterprise.inject.spi.Extension | 0 .../db/migration/V1__Create_person_table.sql | 0 .../resources/db/migration/V2__Add_people.sql | 0 {guice => di-modules/guice}/README.md | 0 {guice => di-modules/guice}/pom.xml | 5 ++-- .../java/com/baeldung/examples/RunGuice.java | 0 .../com/baeldung/examples/common/Account.java | 0 .../examples/common/AccountService.java | 0 .../examples/common/AccountServiceImpl.java | 0 .../examples/common/AudioBookService.java | 0 .../examples/common/AudioBookServiceImpl.java | 0 .../examples/common/AuthorService.java | 0 .../examples/common/AuthorServiceImpl.java | 0 .../baeldung/examples/common/BookService.java | 0 .../examples/common/BookServiceImpl.java | 0 .../baeldung/examples/common/PersonDao.java | 0 .../examples/common/PersonDaoImpl.java | 0 .../examples/guice/Communication.java | 0 .../examples/guice/CommunicationMode.java | 0 .../examples/guice/DefaultCommunicator.java | 0 .../guice/EmailCommunicationMode.java | 0 .../java/com/baeldung/examples/guice/Foo.java | 0 .../baeldung/examples/guice/FooProcessor.java | 0 .../examples/guice/GuicePersonService.java | 0 .../examples/guice/GuiceUserService.java | 0 .../examples/guice/IMCommunicationMode.java | 0 .../com/baeldung/examples/guice/Person.java | 0 .../examples/guice/SMSCommunicationMode.java | 0 .../examples/guice/aop/MessageLogger.java | 0 .../guice/aop/MessageSentLoggable.java | 0 .../examples/guice/binding/AOPModule.java | 0 .../examples/guice/binding/BasicModule.java | 0 .../guice/constant/CommunicationModel.java | 0 .../examples/guice/marker/Communicator.java | 0 .../examples/guice/modules/BasicModule.java | 0 .../examples/guice/modules/GuiceModule.java | 0 .../guice}/src/main/resources/logback.xml | 0 .../com/baeldung/examples/GuiceUnitTest.java | 0 di-modules/pom.xml | 22 +++++++++++++++++ pom.xml | 24 ++++--------------- .../apache-tomcat}/pom.xml | 7 ++---- .../apache-tomcat}/sso/.dockerignore | 0 .../apache-tomcat}/sso/README.md | 0 .../apache-tomcat}/sso/docker-compose.yml | 0 .../apache-tomcat}/sso/pom.xml | 0 .../sso/res/conf/catalina.policy | 0 .../sso/res/conf/catalina.properties | 0 .../apache-tomcat}/sso/res/conf/context.xml | 0 .../sso/res/conf/jaspic-providers.xml | 0 .../sso/res/conf/jaspic-providers.xsd | 0 .../sso/res/conf/logging.properties | 0 .../apache-tomcat}/sso/res/conf/server.xml | 0 .../sso/res/conf/tomcat-users.xml | 0 .../sso/res/conf/tomcat-users.xsd | 0 .../apache-tomcat}/sso/res/conf/web.xml | 0 .../sso/webapps/ping/WEB-INF/web.xml | 0 .../sso/webapps/ping/index.html | 0 .../sso/webapps/ping/logging.html | 0 .../sso/webapps/ping/logging_error.html | 0 .../sso/webapps/ping/private/index.html | 0 .../sso/webapps/pong/WEB-INF/web.xml | 0 .../sso/webapps/pong/index.html | 0 .../sso/webapps/pong/private/index.html | 0 {netty => server-modules/netty}/README.md | 0 {netty => server-modules/netty}/pom.xml | 5 ++-- .../http/server/CustomHttpServerHandler.java | 0 .../com/baeldung/http/server/HttpServer.java | 0 .../baeldung/http/server/RequestUtils.java | 0 .../com/baeldung/netty/http2/Http2Util.java | 0 .../http2/client/Http2ClientInitializer.java | 0 .../client/Http2ClientResponseHandler.java | 0 .../http2/client/Http2SettingsHandler.java | 0 .../netty/http2/server/Http2Server.java | 0 .../server/Http2ServerResponseHandler.java | 0 .../netty}/src/main/resources/logback.xml | 0 .../http/server/HttpServerLiveTest.java | 0 .../http/server/ResponseAggregator.java | 0 .../baeldung/netty/Http2ClientLiveTest.java | 0 server-modules/pom.xml | 22 +++++++++++++++++ .../undertow}/README.md | 0 {undertow => server-modules/undertow}/pom.xml | 6 ++--- .../com/baeldung/undertow/SimpleServer.java | 0 .../com/baeldung/undertow/ftp/FileServer.java | 0 .../secure/CustomIdentityManager.java | 0 .../undertow/secure/SecureServer.java | 0 .../undertow/socket/SocketServer.java | 0 .../undertow}/src/main/resources/logback.xml | 0 {wildfly => server-modules/wildfly}/README.md | 0 {wildfly => server-modules/wildfly}/pom.xml | 0 .../src/main/java/hello/Application.java | 0 .../src/main/java/hello/HelloController.java | 0 spring-web-modules/pom.xml | 3 ++- .../spring-freemarker}/.gitignore | 0 .../spring-freemarker}/README.md | 0 .../spring-freemarker}/pom.xml | 0 .../freemarker/config/SpringWebConfig.java | 0 .../freemarker/config/WebConfiguration.java | 0 .../controller/SpringController.java | 0 .../freemarker/method/LastCharMethod.java | 0 .../com/baeldung/freemarker/model/Car.java | 0 .../src/main/resources/logback.xml | 0 .../main/webapp/WEB-INF/views/ftl/commons.ftl | 0 .../main/webapp/WEB-INF/views/ftl/index.ftl | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 156 files changed, 63 insertions(+), 43 deletions(-) rename {cdi => di-modules/cdi}/README.md (100%) rename {cdi => di-modules/cdi}/pom.xml (97%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/cdi2observers/application/BootstrappingApplication.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/cdi2observers/events/ExampleEvent.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/cdi2observers/events/ExampleEventSource.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/cdi2observers/observers/AnotherExampleEventObserver.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/cdi2observers/observers/ExampleEventObserver.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/cdi2observers/services/TextService.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/dependencyinjection/application/FileApplication.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/dependencyinjection/factories/TimeLoggerFactory.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/GifFileEditor.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/ImageFileEditor.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/JpgFileEditor.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/PngFileEditor.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/dependencyinjection/imageprocessors/ImageFileProcessor.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/dependencyinjection/loggers/TimeLogger.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/dependencyinjection/qualifiers/GifFileEditorQualifier.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/dependencyinjection/qualifiers/JpgFileEditorQualifier.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/dependencyinjection/qualifiers/PngFileEditorQualifier.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/interceptor/Audited.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/service/SuperService.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/spring/configuration/AppConfig.java (100%) rename {cdi => di-modules/cdi}/src/main/java/com/baeldung/spring/service/SpringSuperService.java (100%) rename {cdi => di-modules/cdi}/src/main/resources/META-INF/beans.xml (100%) rename {cdi => di-modules/cdi}/src/main/resources/logback.xml (100%) rename {cdi => di-modules/cdi}/src/test/java/com/baeldung/test/InterceptorIntegrationTest.java (100%) rename {cdi => di-modules/cdi}/src/test/java/com/baeldung/test/SpringInterceptorIntegrationTest.java (100%) rename {cdi => di-modules/cdi}/src/test/java/com/baeldung/test/cdi2observers/tests/TextServiceUnitTest.java (100%) rename {cdi => di-modules/cdi}/src/test/java/com/baeldung/test/dependencyinjection/GifFileEditorUnitTest.java (100%) rename {cdi => di-modules/cdi}/src/test/java/com/baeldung/test/dependencyinjection/ImageProcessorUnitTest.java (100%) rename {cdi => di-modules/cdi}/src/test/java/com/baeldung/test/dependencyinjection/JpgFileEditorUnitTest.java (100%) rename {cdi => di-modules/cdi}/src/test/java/com/baeldung/test/dependencyinjection/PngFileEditorUnitTest.java (100%) rename {cdi => di-modules/cdi}/src/test/java/com/baeldung/test/dependencyinjection/TimeLoggerFactoryUnitTest.java (100%) rename {cdi => di-modules/cdi}/src/test/java/com/baeldung/test/dependencyinjection/TimeLoggerUnitTest.java (100%) rename {dagger => di-modules/dagger}/README.md (100%) rename {dagger => di-modules/dagger}/pom.xml (96%) rename {dagger => di-modules/dagger}/src/main/java/com/baeldung/dagger/intro/Brand.java (100%) rename {dagger => di-modules/dagger}/src/main/java/com/baeldung/dagger/intro/Car.java (100%) rename {dagger => di-modules/dagger}/src/main/java/com/baeldung/dagger/intro/Engine.java (100%) rename {dagger => di-modules/dagger}/src/main/java/com/baeldung/dagger/intro/VehiclesComponent.java (100%) rename {dagger => di-modules/dagger}/src/main/java/com/baeldung/dagger/intro/VehiclesModule.java (100%) rename {dagger => di-modules/dagger}/src/main/resources/logback.xml (100%) rename {dagger => di-modules/dagger}/src/test/java/com/baeldung/dagger/intro/DaggerUnitTest.java (100%) rename {flyway-cdi-extension => di-modules/flyway-cdi-extension}/README.md (100%) rename {flyway-cdi-extension => di-modules/flyway-cdi-extension}/pom.xml (95%) rename {flyway-cdi-extension => di-modules/flyway-cdi-extension}/src/main/java/com/baeldung/cdi/extension/FlywayExtension.java (100%) rename {flyway-cdi-extension => di-modules/flyway-cdi-extension}/src/main/java/com/baeldung/cdi/extension/FlywayType.java (100%) rename {flyway-cdi-extension => di-modules/flyway-cdi-extension}/src/main/java/com/baeldung/cdi/extension/MainApp.java (100%) rename {flyway-cdi-extension => di-modules/flyway-cdi-extension}/src/main/resources/META-INF/beans.xml (100%) rename {flyway-cdi-extension => di-modules/flyway-cdi-extension}/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (100%) rename {flyway-cdi-extension => di-modules/flyway-cdi-extension}/src/main/resources/db/migration/V1__Create_person_table.sql (100%) rename {flyway-cdi-extension => di-modules/flyway-cdi-extension}/src/main/resources/db/migration/V2__Add_people.sql (100%) rename {guice => di-modules/guice}/README.md (100%) rename {guice => di-modules/guice}/pom.xml (90%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/RunGuice.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/common/Account.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/common/AccountService.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/common/AccountServiceImpl.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/common/AudioBookService.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/common/AudioBookServiceImpl.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/common/AuthorService.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/common/AuthorServiceImpl.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/common/BookService.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/common/BookServiceImpl.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/common/PersonDao.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/common/PersonDaoImpl.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/Communication.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/CommunicationMode.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/DefaultCommunicator.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/EmailCommunicationMode.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/Foo.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/FooProcessor.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/GuicePersonService.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/GuiceUserService.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/IMCommunicationMode.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/Person.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/SMSCommunicationMode.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/aop/MessageLogger.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/aop/MessageSentLoggable.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/binding/AOPModule.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/binding/BasicModule.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/constant/CommunicationModel.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/marker/Communicator.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/modules/BasicModule.java (100%) rename {guice => di-modules/guice}/src/main/java/com/baeldung/examples/guice/modules/GuiceModule.java (100%) rename {guice => di-modules/guice}/src/main/resources/logback.xml (100%) rename {guice => di-modules/guice}/src/test/java/com/baeldung/examples/GuiceUnitTest.java (100%) create mode 100644 di-modules/pom.xml rename {apache-tomcat => server-modules/apache-tomcat}/pom.xml (86%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/.dockerignore (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/README.md (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/docker-compose.yml (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/pom.xml (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/res/conf/catalina.policy (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/res/conf/catalina.properties (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/res/conf/context.xml (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/res/conf/jaspic-providers.xml (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/res/conf/jaspic-providers.xsd (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/res/conf/logging.properties (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/res/conf/server.xml (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/res/conf/tomcat-users.xml (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/res/conf/tomcat-users.xsd (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/res/conf/web.xml (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/webapps/ping/WEB-INF/web.xml (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/webapps/ping/index.html (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/webapps/ping/logging.html (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/webapps/ping/logging_error.html (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/webapps/ping/private/index.html (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/webapps/pong/WEB-INF/web.xml (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/webapps/pong/index.html (100%) rename {apache-tomcat => server-modules/apache-tomcat}/sso/webapps/pong/private/index.html (100%) rename {netty => server-modules/netty}/README.md (100%) rename {netty => server-modules/netty}/pom.xml (91%) rename {netty => server-modules/netty}/src/main/java/com/baeldung/http/server/CustomHttpServerHandler.java (100%) rename {netty => server-modules/netty}/src/main/java/com/baeldung/http/server/HttpServer.java (100%) rename {netty => server-modules/netty}/src/main/java/com/baeldung/http/server/RequestUtils.java (100%) rename {netty => server-modules/netty}/src/main/java/com/baeldung/netty/http2/Http2Util.java (100%) rename {netty => server-modules/netty}/src/main/java/com/baeldung/netty/http2/client/Http2ClientInitializer.java (100%) rename {netty => server-modules/netty}/src/main/java/com/baeldung/netty/http2/client/Http2ClientResponseHandler.java (100%) rename {netty => server-modules/netty}/src/main/java/com/baeldung/netty/http2/client/Http2SettingsHandler.java (100%) rename {netty => server-modules/netty}/src/main/java/com/baeldung/netty/http2/server/Http2Server.java (100%) rename {netty => server-modules/netty}/src/main/java/com/baeldung/netty/http2/server/Http2ServerResponseHandler.java (100%) rename {netty => server-modules/netty}/src/main/resources/logback.xml (100%) rename {netty => server-modules/netty}/src/test/java/com/baeldung/http/server/HttpServerLiveTest.java (100%) rename {netty => server-modules/netty}/src/test/java/com/baeldung/http/server/ResponseAggregator.java (100%) rename {netty => server-modules/netty}/src/test/java/com/baeldung/netty/Http2ClientLiveTest.java (100%) create mode 100644 server-modules/pom.xml rename {undertow => server-modules/undertow}/README.md (100%) rename {undertow => server-modules/undertow}/pom.xml (94%) rename {undertow => server-modules/undertow}/src/main/java/com/baeldung/undertow/SimpleServer.java (100%) rename {undertow => server-modules/undertow}/src/main/java/com/baeldung/undertow/ftp/FileServer.java (100%) rename {undertow => server-modules/undertow}/src/main/java/com/baeldung/undertow/secure/CustomIdentityManager.java (100%) rename {undertow => server-modules/undertow}/src/main/java/com/baeldung/undertow/secure/SecureServer.java (100%) rename {undertow => server-modules/undertow}/src/main/java/com/baeldung/undertow/socket/SocketServer.java (100%) rename {spring-freemarker => server-modules/undertow}/src/main/resources/logback.xml (100%) rename {wildfly => server-modules/wildfly}/README.md (100%) rename {wildfly => server-modules/wildfly}/pom.xml (100%) rename {wildfly => server-modules/wildfly}/src/main/java/hello/Application.java (100%) rename {wildfly => server-modules/wildfly}/src/main/java/hello/HelloController.java (100%) rename {spring-freemarker => spring-web-modules/spring-freemarker}/.gitignore (100%) rename {spring-freemarker => spring-web-modules/spring-freemarker}/README.md (100%) rename {spring-freemarker => spring-web-modules/spring-freemarker}/pom.xml (100%) rename {spring-freemarker => spring-web-modules/spring-freemarker}/src/main/java/com/baeldung/freemarker/config/SpringWebConfig.java (100%) rename {spring-freemarker => spring-web-modules/spring-freemarker}/src/main/java/com/baeldung/freemarker/config/WebConfiguration.java (100%) rename {spring-freemarker => spring-web-modules/spring-freemarker}/src/main/java/com/baeldung/freemarker/controller/SpringController.java (100%) rename {spring-freemarker => spring-web-modules/spring-freemarker}/src/main/java/com/baeldung/freemarker/method/LastCharMethod.java (100%) rename {spring-freemarker => spring-web-modules/spring-freemarker}/src/main/java/com/baeldung/freemarker/model/Car.java (100%) rename {undertow => spring-web-modules/spring-freemarker}/src/main/resources/logback.xml (100%) rename {spring-freemarker => spring-web-modules/spring-freemarker}/src/main/webapp/WEB-INF/views/ftl/commons.ftl (100%) rename {spring-freemarker => spring-web-modules/spring-freemarker}/src/main/webapp/WEB-INF/views/ftl/index.ftl (100%) rename {spring-freemarker => spring-web-modules/spring-freemarker}/src/main/webapp/WEB-INF/web.xml (100%) rename {spring-freemarker => spring-web-modules/spring-freemarker}/src/test/java/com/baeldung/SpringContextTest.java (100%) diff --git a/cdi/README.md b/di-modules/cdi/README.md similarity index 100% rename from cdi/README.md rename to di-modules/cdi/README.md diff --git a/cdi/pom.xml b/di-modules/cdi/pom.xml similarity index 97% rename from cdi/pom.xml rename to di-modules/cdi/pom.xml index ee23e082c7..6b2382ba0e 100644 --- a/cdi/pom.xml +++ b/di-modules/cdi/pom.xml @@ -4,7 +4,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 cdi - 1.0-SNAPSHOT cdi @@ -49,4 +48,4 @@ 1.9.2 - \ No newline at end of file + diff --git a/cdi/src/main/java/com/baeldung/cdi2observers/application/BootstrappingApplication.java b/di-modules/cdi/src/main/java/com/baeldung/cdi2observers/application/BootstrappingApplication.java similarity index 100% rename from cdi/src/main/java/com/baeldung/cdi2observers/application/BootstrappingApplication.java rename to di-modules/cdi/src/main/java/com/baeldung/cdi2observers/application/BootstrappingApplication.java diff --git a/cdi/src/main/java/com/baeldung/cdi2observers/events/ExampleEvent.java b/di-modules/cdi/src/main/java/com/baeldung/cdi2observers/events/ExampleEvent.java similarity index 100% rename from cdi/src/main/java/com/baeldung/cdi2observers/events/ExampleEvent.java rename to di-modules/cdi/src/main/java/com/baeldung/cdi2observers/events/ExampleEvent.java diff --git a/cdi/src/main/java/com/baeldung/cdi2observers/events/ExampleEventSource.java b/di-modules/cdi/src/main/java/com/baeldung/cdi2observers/events/ExampleEventSource.java similarity index 100% rename from cdi/src/main/java/com/baeldung/cdi2observers/events/ExampleEventSource.java rename to di-modules/cdi/src/main/java/com/baeldung/cdi2observers/events/ExampleEventSource.java diff --git a/cdi/src/main/java/com/baeldung/cdi2observers/observers/AnotherExampleEventObserver.java b/di-modules/cdi/src/main/java/com/baeldung/cdi2observers/observers/AnotherExampleEventObserver.java similarity index 100% rename from cdi/src/main/java/com/baeldung/cdi2observers/observers/AnotherExampleEventObserver.java rename to di-modules/cdi/src/main/java/com/baeldung/cdi2observers/observers/AnotherExampleEventObserver.java diff --git a/cdi/src/main/java/com/baeldung/cdi2observers/observers/ExampleEventObserver.java b/di-modules/cdi/src/main/java/com/baeldung/cdi2observers/observers/ExampleEventObserver.java similarity index 100% rename from cdi/src/main/java/com/baeldung/cdi2observers/observers/ExampleEventObserver.java rename to di-modules/cdi/src/main/java/com/baeldung/cdi2observers/observers/ExampleEventObserver.java diff --git a/cdi/src/main/java/com/baeldung/cdi2observers/services/TextService.java b/di-modules/cdi/src/main/java/com/baeldung/cdi2observers/services/TextService.java similarity index 100% rename from cdi/src/main/java/com/baeldung/cdi2observers/services/TextService.java rename to di-modules/cdi/src/main/java/com/baeldung/cdi2observers/services/TextService.java diff --git a/cdi/src/main/java/com/baeldung/dependencyinjection/application/FileApplication.java b/di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/application/FileApplication.java similarity index 100% rename from cdi/src/main/java/com/baeldung/dependencyinjection/application/FileApplication.java rename to di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/application/FileApplication.java diff --git a/cdi/src/main/java/com/baeldung/dependencyinjection/factories/TimeLoggerFactory.java b/di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/factories/TimeLoggerFactory.java similarity index 100% rename from cdi/src/main/java/com/baeldung/dependencyinjection/factories/TimeLoggerFactory.java rename to di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/factories/TimeLoggerFactory.java diff --git a/cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/GifFileEditor.java b/di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/GifFileEditor.java similarity index 100% rename from cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/GifFileEditor.java rename to di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/GifFileEditor.java diff --git a/cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/ImageFileEditor.java b/di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/ImageFileEditor.java similarity index 100% rename from cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/ImageFileEditor.java rename to di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/ImageFileEditor.java diff --git a/cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/JpgFileEditor.java b/di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/JpgFileEditor.java similarity index 100% rename from cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/JpgFileEditor.java rename to di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/JpgFileEditor.java diff --git a/cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/PngFileEditor.java b/di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/PngFileEditor.java similarity index 100% rename from cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/PngFileEditor.java rename to di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/imagefileeditors/PngFileEditor.java diff --git a/cdi/src/main/java/com/baeldung/dependencyinjection/imageprocessors/ImageFileProcessor.java b/di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/imageprocessors/ImageFileProcessor.java similarity index 100% rename from cdi/src/main/java/com/baeldung/dependencyinjection/imageprocessors/ImageFileProcessor.java rename to di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/imageprocessors/ImageFileProcessor.java diff --git a/cdi/src/main/java/com/baeldung/dependencyinjection/loggers/TimeLogger.java b/di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/loggers/TimeLogger.java similarity index 100% rename from cdi/src/main/java/com/baeldung/dependencyinjection/loggers/TimeLogger.java rename to di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/loggers/TimeLogger.java diff --git a/cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/GifFileEditorQualifier.java b/di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/GifFileEditorQualifier.java similarity index 100% rename from cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/GifFileEditorQualifier.java rename to di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/GifFileEditorQualifier.java diff --git a/cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/JpgFileEditorQualifier.java b/di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/JpgFileEditorQualifier.java similarity index 100% rename from cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/JpgFileEditorQualifier.java rename to di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/JpgFileEditorQualifier.java diff --git a/cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/PngFileEditorQualifier.java b/di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/PngFileEditorQualifier.java similarity index 100% rename from cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/PngFileEditorQualifier.java rename to di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/PngFileEditorQualifier.java diff --git a/cdi/src/main/java/com/baeldung/interceptor/Audited.java b/di-modules/cdi/src/main/java/com/baeldung/interceptor/Audited.java similarity index 100% rename from cdi/src/main/java/com/baeldung/interceptor/Audited.java rename to di-modules/cdi/src/main/java/com/baeldung/interceptor/Audited.java diff --git a/cdi/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java b/di-modules/cdi/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java similarity index 100% rename from cdi/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java rename to di-modules/cdi/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java diff --git a/cdi/src/main/java/com/baeldung/service/SuperService.java b/di-modules/cdi/src/main/java/com/baeldung/service/SuperService.java similarity index 100% rename from cdi/src/main/java/com/baeldung/service/SuperService.java rename to di-modules/cdi/src/main/java/com/baeldung/service/SuperService.java diff --git a/cdi/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java b/di-modules/cdi/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java similarity index 100% rename from cdi/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java rename to di-modules/cdi/src/main/java/com/baeldung/spring/aspect/SpringTestAspect.java diff --git a/cdi/src/main/java/com/baeldung/spring/configuration/AppConfig.java b/di-modules/cdi/src/main/java/com/baeldung/spring/configuration/AppConfig.java similarity index 100% rename from cdi/src/main/java/com/baeldung/spring/configuration/AppConfig.java rename to di-modules/cdi/src/main/java/com/baeldung/spring/configuration/AppConfig.java diff --git a/cdi/src/main/java/com/baeldung/spring/service/SpringSuperService.java b/di-modules/cdi/src/main/java/com/baeldung/spring/service/SpringSuperService.java similarity index 100% rename from cdi/src/main/java/com/baeldung/spring/service/SpringSuperService.java rename to di-modules/cdi/src/main/java/com/baeldung/spring/service/SpringSuperService.java diff --git a/cdi/src/main/resources/META-INF/beans.xml b/di-modules/cdi/src/main/resources/META-INF/beans.xml similarity index 100% rename from cdi/src/main/resources/META-INF/beans.xml rename to di-modules/cdi/src/main/resources/META-INF/beans.xml diff --git a/cdi/src/main/resources/logback.xml b/di-modules/cdi/src/main/resources/logback.xml similarity index 100% rename from cdi/src/main/resources/logback.xml rename to di-modules/cdi/src/main/resources/logback.xml diff --git a/cdi/src/test/java/com/baeldung/test/InterceptorIntegrationTest.java b/di-modules/cdi/src/test/java/com/baeldung/test/InterceptorIntegrationTest.java similarity index 100% rename from cdi/src/test/java/com/baeldung/test/InterceptorIntegrationTest.java rename to di-modules/cdi/src/test/java/com/baeldung/test/InterceptorIntegrationTest.java diff --git a/cdi/src/test/java/com/baeldung/test/SpringInterceptorIntegrationTest.java b/di-modules/cdi/src/test/java/com/baeldung/test/SpringInterceptorIntegrationTest.java similarity index 100% rename from cdi/src/test/java/com/baeldung/test/SpringInterceptorIntegrationTest.java rename to di-modules/cdi/src/test/java/com/baeldung/test/SpringInterceptorIntegrationTest.java diff --git a/cdi/src/test/java/com/baeldung/test/cdi2observers/tests/TextServiceUnitTest.java b/di-modules/cdi/src/test/java/com/baeldung/test/cdi2observers/tests/TextServiceUnitTest.java similarity index 100% rename from cdi/src/test/java/com/baeldung/test/cdi2observers/tests/TextServiceUnitTest.java rename to di-modules/cdi/src/test/java/com/baeldung/test/cdi2observers/tests/TextServiceUnitTest.java diff --git a/cdi/src/test/java/com/baeldung/test/dependencyinjection/GifFileEditorUnitTest.java b/di-modules/cdi/src/test/java/com/baeldung/test/dependencyinjection/GifFileEditorUnitTest.java similarity index 100% rename from cdi/src/test/java/com/baeldung/test/dependencyinjection/GifFileEditorUnitTest.java rename to di-modules/cdi/src/test/java/com/baeldung/test/dependencyinjection/GifFileEditorUnitTest.java diff --git a/cdi/src/test/java/com/baeldung/test/dependencyinjection/ImageProcessorUnitTest.java b/di-modules/cdi/src/test/java/com/baeldung/test/dependencyinjection/ImageProcessorUnitTest.java similarity index 100% rename from cdi/src/test/java/com/baeldung/test/dependencyinjection/ImageProcessorUnitTest.java rename to di-modules/cdi/src/test/java/com/baeldung/test/dependencyinjection/ImageProcessorUnitTest.java diff --git a/cdi/src/test/java/com/baeldung/test/dependencyinjection/JpgFileEditorUnitTest.java b/di-modules/cdi/src/test/java/com/baeldung/test/dependencyinjection/JpgFileEditorUnitTest.java similarity index 100% rename from cdi/src/test/java/com/baeldung/test/dependencyinjection/JpgFileEditorUnitTest.java rename to di-modules/cdi/src/test/java/com/baeldung/test/dependencyinjection/JpgFileEditorUnitTest.java diff --git a/cdi/src/test/java/com/baeldung/test/dependencyinjection/PngFileEditorUnitTest.java b/di-modules/cdi/src/test/java/com/baeldung/test/dependencyinjection/PngFileEditorUnitTest.java similarity index 100% rename from cdi/src/test/java/com/baeldung/test/dependencyinjection/PngFileEditorUnitTest.java rename to di-modules/cdi/src/test/java/com/baeldung/test/dependencyinjection/PngFileEditorUnitTest.java diff --git a/cdi/src/test/java/com/baeldung/test/dependencyinjection/TimeLoggerFactoryUnitTest.java b/di-modules/cdi/src/test/java/com/baeldung/test/dependencyinjection/TimeLoggerFactoryUnitTest.java similarity index 100% rename from cdi/src/test/java/com/baeldung/test/dependencyinjection/TimeLoggerFactoryUnitTest.java rename to di-modules/cdi/src/test/java/com/baeldung/test/dependencyinjection/TimeLoggerFactoryUnitTest.java diff --git a/cdi/src/test/java/com/baeldung/test/dependencyinjection/TimeLoggerUnitTest.java b/di-modules/cdi/src/test/java/com/baeldung/test/dependencyinjection/TimeLoggerUnitTest.java similarity index 100% rename from cdi/src/test/java/com/baeldung/test/dependencyinjection/TimeLoggerUnitTest.java rename to di-modules/cdi/src/test/java/com/baeldung/test/dependencyinjection/TimeLoggerUnitTest.java diff --git a/dagger/README.md b/di-modules/dagger/README.md similarity index 100% rename from dagger/README.md rename to di-modules/dagger/README.md diff --git a/dagger/pom.xml b/di-modules/dagger/pom.xml similarity index 96% rename from dagger/pom.xml rename to di-modules/dagger/pom.xml index 304b0e428e..06a87b0475 100644 --- a/dagger/pom.xml +++ b/di-modules/dagger/pom.xml @@ -8,7 +8,7 @@ com.baeldung - parent-modules + di-modules 1.0.0-SNAPSHOT @@ -45,4 +45,4 @@ 2.16 - \ No newline at end of file + diff --git a/dagger/src/main/java/com/baeldung/dagger/intro/Brand.java b/di-modules/dagger/src/main/java/com/baeldung/dagger/intro/Brand.java similarity index 100% rename from dagger/src/main/java/com/baeldung/dagger/intro/Brand.java rename to di-modules/dagger/src/main/java/com/baeldung/dagger/intro/Brand.java diff --git a/dagger/src/main/java/com/baeldung/dagger/intro/Car.java b/di-modules/dagger/src/main/java/com/baeldung/dagger/intro/Car.java similarity index 100% rename from dagger/src/main/java/com/baeldung/dagger/intro/Car.java rename to di-modules/dagger/src/main/java/com/baeldung/dagger/intro/Car.java diff --git a/dagger/src/main/java/com/baeldung/dagger/intro/Engine.java b/di-modules/dagger/src/main/java/com/baeldung/dagger/intro/Engine.java similarity index 100% rename from dagger/src/main/java/com/baeldung/dagger/intro/Engine.java rename to di-modules/dagger/src/main/java/com/baeldung/dagger/intro/Engine.java diff --git a/dagger/src/main/java/com/baeldung/dagger/intro/VehiclesComponent.java b/di-modules/dagger/src/main/java/com/baeldung/dagger/intro/VehiclesComponent.java similarity index 100% rename from dagger/src/main/java/com/baeldung/dagger/intro/VehiclesComponent.java rename to di-modules/dagger/src/main/java/com/baeldung/dagger/intro/VehiclesComponent.java diff --git a/dagger/src/main/java/com/baeldung/dagger/intro/VehiclesModule.java b/di-modules/dagger/src/main/java/com/baeldung/dagger/intro/VehiclesModule.java similarity index 100% rename from dagger/src/main/java/com/baeldung/dagger/intro/VehiclesModule.java rename to di-modules/dagger/src/main/java/com/baeldung/dagger/intro/VehiclesModule.java diff --git a/dagger/src/main/resources/logback.xml b/di-modules/dagger/src/main/resources/logback.xml similarity index 100% rename from dagger/src/main/resources/logback.xml rename to di-modules/dagger/src/main/resources/logback.xml diff --git a/dagger/src/test/java/com/baeldung/dagger/intro/DaggerUnitTest.java b/di-modules/dagger/src/test/java/com/baeldung/dagger/intro/DaggerUnitTest.java similarity index 100% rename from dagger/src/test/java/com/baeldung/dagger/intro/DaggerUnitTest.java rename to di-modules/dagger/src/test/java/com/baeldung/dagger/intro/DaggerUnitTest.java diff --git a/flyway-cdi-extension/README.md b/di-modules/flyway-cdi-extension/README.md similarity index 100% rename from flyway-cdi-extension/README.md rename to di-modules/flyway-cdi-extension/README.md diff --git a/flyway-cdi-extension/pom.xml b/di-modules/flyway-cdi-extension/pom.xml similarity index 95% rename from flyway-cdi-extension/pom.xml rename to di-modules/flyway-cdi-extension/pom.xml index 3d52ff0e36..7e9b73a127 100644 --- a/flyway-cdi-extension/pom.xml +++ b/di-modules/flyway-cdi-extension/pom.xml @@ -4,12 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 flyway-cdi-extension - 1.0-SNAPSHOT flyway-cdi-extension com.baeldung - parent-modules + di-modules 1.0.0-SNAPSHOT @@ -56,4 +55,4 @@ 1.3.2 - \ No newline at end of file + diff --git a/flyway-cdi-extension/src/main/java/com/baeldung/cdi/extension/FlywayExtension.java b/di-modules/flyway-cdi-extension/src/main/java/com/baeldung/cdi/extension/FlywayExtension.java similarity index 100% rename from flyway-cdi-extension/src/main/java/com/baeldung/cdi/extension/FlywayExtension.java rename to di-modules/flyway-cdi-extension/src/main/java/com/baeldung/cdi/extension/FlywayExtension.java diff --git a/flyway-cdi-extension/src/main/java/com/baeldung/cdi/extension/FlywayType.java b/di-modules/flyway-cdi-extension/src/main/java/com/baeldung/cdi/extension/FlywayType.java similarity index 100% rename from flyway-cdi-extension/src/main/java/com/baeldung/cdi/extension/FlywayType.java rename to di-modules/flyway-cdi-extension/src/main/java/com/baeldung/cdi/extension/FlywayType.java diff --git a/flyway-cdi-extension/src/main/java/com/baeldung/cdi/extension/MainApp.java b/di-modules/flyway-cdi-extension/src/main/java/com/baeldung/cdi/extension/MainApp.java similarity index 100% rename from flyway-cdi-extension/src/main/java/com/baeldung/cdi/extension/MainApp.java rename to di-modules/flyway-cdi-extension/src/main/java/com/baeldung/cdi/extension/MainApp.java diff --git a/flyway-cdi-extension/src/main/resources/META-INF/beans.xml b/di-modules/flyway-cdi-extension/src/main/resources/META-INF/beans.xml similarity index 100% rename from flyway-cdi-extension/src/main/resources/META-INF/beans.xml rename to di-modules/flyway-cdi-extension/src/main/resources/META-INF/beans.xml diff --git a/flyway-cdi-extension/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/di-modules/flyway-cdi-extension/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension similarity index 100% rename from flyway-cdi-extension/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension rename to di-modules/flyway-cdi-extension/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension diff --git a/flyway-cdi-extension/src/main/resources/db/migration/V1__Create_person_table.sql b/di-modules/flyway-cdi-extension/src/main/resources/db/migration/V1__Create_person_table.sql similarity index 100% rename from flyway-cdi-extension/src/main/resources/db/migration/V1__Create_person_table.sql rename to di-modules/flyway-cdi-extension/src/main/resources/db/migration/V1__Create_person_table.sql diff --git a/flyway-cdi-extension/src/main/resources/db/migration/V2__Add_people.sql b/di-modules/flyway-cdi-extension/src/main/resources/db/migration/V2__Add_people.sql similarity index 100% rename from flyway-cdi-extension/src/main/resources/db/migration/V2__Add_people.sql rename to di-modules/flyway-cdi-extension/src/main/resources/db/migration/V2__Add_people.sql diff --git a/guice/README.md b/di-modules/guice/README.md similarity index 100% rename from guice/README.md rename to di-modules/guice/README.md diff --git a/guice/pom.xml b/di-modules/guice/pom.xml similarity index 90% rename from guice/pom.xml rename to di-modules/guice/pom.xml index 2d968cdfc7..39b1f20b76 100644 --- a/guice/pom.xml +++ b/di-modules/guice/pom.xml @@ -5,13 +5,12 @@ 4.0.0 com.baeldung.examples.guice guice - 1.0-SNAPSHOT guice jar com.baeldung - parent-modules + di-modules 1.0.0-SNAPSHOT @@ -27,4 +26,4 @@ 4.1.0 - \ No newline at end of file + diff --git a/guice/src/main/java/com/baeldung/examples/RunGuice.java b/di-modules/guice/src/main/java/com/baeldung/examples/RunGuice.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/RunGuice.java rename to di-modules/guice/src/main/java/com/baeldung/examples/RunGuice.java diff --git a/guice/src/main/java/com/baeldung/examples/common/Account.java b/di-modules/guice/src/main/java/com/baeldung/examples/common/Account.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/common/Account.java rename to di-modules/guice/src/main/java/com/baeldung/examples/common/Account.java diff --git a/guice/src/main/java/com/baeldung/examples/common/AccountService.java b/di-modules/guice/src/main/java/com/baeldung/examples/common/AccountService.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/common/AccountService.java rename to di-modules/guice/src/main/java/com/baeldung/examples/common/AccountService.java diff --git a/guice/src/main/java/com/baeldung/examples/common/AccountServiceImpl.java b/di-modules/guice/src/main/java/com/baeldung/examples/common/AccountServiceImpl.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/common/AccountServiceImpl.java rename to di-modules/guice/src/main/java/com/baeldung/examples/common/AccountServiceImpl.java diff --git a/guice/src/main/java/com/baeldung/examples/common/AudioBookService.java b/di-modules/guice/src/main/java/com/baeldung/examples/common/AudioBookService.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/common/AudioBookService.java rename to di-modules/guice/src/main/java/com/baeldung/examples/common/AudioBookService.java diff --git a/guice/src/main/java/com/baeldung/examples/common/AudioBookServiceImpl.java b/di-modules/guice/src/main/java/com/baeldung/examples/common/AudioBookServiceImpl.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/common/AudioBookServiceImpl.java rename to di-modules/guice/src/main/java/com/baeldung/examples/common/AudioBookServiceImpl.java diff --git a/guice/src/main/java/com/baeldung/examples/common/AuthorService.java b/di-modules/guice/src/main/java/com/baeldung/examples/common/AuthorService.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/common/AuthorService.java rename to di-modules/guice/src/main/java/com/baeldung/examples/common/AuthorService.java diff --git a/guice/src/main/java/com/baeldung/examples/common/AuthorServiceImpl.java b/di-modules/guice/src/main/java/com/baeldung/examples/common/AuthorServiceImpl.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/common/AuthorServiceImpl.java rename to di-modules/guice/src/main/java/com/baeldung/examples/common/AuthorServiceImpl.java diff --git a/guice/src/main/java/com/baeldung/examples/common/BookService.java b/di-modules/guice/src/main/java/com/baeldung/examples/common/BookService.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/common/BookService.java rename to di-modules/guice/src/main/java/com/baeldung/examples/common/BookService.java diff --git a/guice/src/main/java/com/baeldung/examples/common/BookServiceImpl.java b/di-modules/guice/src/main/java/com/baeldung/examples/common/BookServiceImpl.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/common/BookServiceImpl.java rename to di-modules/guice/src/main/java/com/baeldung/examples/common/BookServiceImpl.java diff --git a/guice/src/main/java/com/baeldung/examples/common/PersonDao.java b/di-modules/guice/src/main/java/com/baeldung/examples/common/PersonDao.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/common/PersonDao.java rename to di-modules/guice/src/main/java/com/baeldung/examples/common/PersonDao.java diff --git a/guice/src/main/java/com/baeldung/examples/common/PersonDaoImpl.java b/di-modules/guice/src/main/java/com/baeldung/examples/common/PersonDaoImpl.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/common/PersonDaoImpl.java rename to di-modules/guice/src/main/java/com/baeldung/examples/common/PersonDaoImpl.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/Communication.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/Communication.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/Communication.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/Communication.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/CommunicationMode.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/CommunicationMode.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/CommunicationMode.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/CommunicationMode.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/DefaultCommunicator.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/DefaultCommunicator.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/DefaultCommunicator.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/DefaultCommunicator.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/EmailCommunicationMode.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/EmailCommunicationMode.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/EmailCommunicationMode.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/EmailCommunicationMode.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/Foo.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/Foo.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/Foo.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/Foo.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/FooProcessor.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/FooProcessor.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/FooProcessor.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/FooProcessor.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/GuicePersonService.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/GuicePersonService.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/GuicePersonService.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/GuicePersonService.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/GuiceUserService.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/GuiceUserService.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/GuiceUserService.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/GuiceUserService.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/IMCommunicationMode.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/IMCommunicationMode.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/IMCommunicationMode.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/IMCommunicationMode.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/Person.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/Person.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/Person.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/Person.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/SMSCommunicationMode.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/SMSCommunicationMode.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/SMSCommunicationMode.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/SMSCommunicationMode.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/aop/MessageLogger.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/aop/MessageLogger.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/aop/MessageLogger.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/aop/MessageLogger.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/aop/MessageSentLoggable.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/aop/MessageSentLoggable.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/aop/MessageSentLoggable.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/aop/MessageSentLoggable.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/binding/AOPModule.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/binding/AOPModule.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/binding/AOPModule.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/binding/AOPModule.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/binding/BasicModule.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/binding/BasicModule.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/binding/BasicModule.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/binding/BasicModule.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/constant/CommunicationModel.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/constant/CommunicationModel.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/constant/CommunicationModel.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/constant/CommunicationModel.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/marker/Communicator.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/marker/Communicator.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/marker/Communicator.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/marker/Communicator.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/modules/BasicModule.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/modules/BasicModule.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/modules/BasicModule.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/modules/BasicModule.java diff --git a/guice/src/main/java/com/baeldung/examples/guice/modules/GuiceModule.java b/di-modules/guice/src/main/java/com/baeldung/examples/guice/modules/GuiceModule.java similarity index 100% rename from guice/src/main/java/com/baeldung/examples/guice/modules/GuiceModule.java rename to di-modules/guice/src/main/java/com/baeldung/examples/guice/modules/GuiceModule.java diff --git a/guice/src/main/resources/logback.xml b/di-modules/guice/src/main/resources/logback.xml similarity index 100% rename from guice/src/main/resources/logback.xml rename to di-modules/guice/src/main/resources/logback.xml diff --git a/guice/src/test/java/com/baeldung/examples/GuiceUnitTest.java b/di-modules/guice/src/test/java/com/baeldung/examples/GuiceUnitTest.java similarity index 100% rename from guice/src/test/java/com/baeldung/examples/GuiceUnitTest.java rename to di-modules/guice/src/test/java/com/baeldung/examples/GuiceUnitTest.java diff --git a/di-modules/pom.xml b/di-modules/pom.xml new file mode 100644 index 0000000000..675d6117a6 --- /dev/null +++ b/di-modules/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + di-modules + di-modules + pom + + + parent-modules + com.baeldung + 1.0.0-SNAPSHOT + + + + cdi + dagger + flyway-cdi-extension + guice + + diff --git a/pom.xml b/pom.xml index ba1f778614..883f5b58f4 100644 --- a/pom.xml +++ b/pom.xml @@ -360,7 +360,6 @@ azure bazel - cdi checker-plugin code-generation @@ -372,10 +371,10 @@ couchbase custom-pmd - dagger data-structures ddd deeplearning4j + di-modules discord4j disruptor dozer @@ -385,7 +384,6 @@ feign - flyway-cdi-extension geotools google-cloud @@ -396,7 +394,6 @@ grpc guava-modules - guice hazelcast apache-httpclient @@ -467,7 +464,6 @@ mybatis netflix-modules - netty orika osgi @@ -537,6 +533,7 @@ parent-java saas + server-modules spf4j @@ -580,8 +577,6 @@ spring-ejb-modules spring-exceptions - spring-freemarker - spring-integration spring-jenkins-pipeline @@ -627,13 +622,10 @@ twilio twitter4j - undertow - vertx-modules video-tutorials webrtc - wildfly xml xml-2 xstream @@ -762,7 +754,6 @@ azure bazel - cdi checker-plugin code-generation @@ -774,10 +765,10 @@ couchbase custom-pmd - dagger data-structures ddd deeplearning4j + di-modules discord4j disruptor dozer @@ -787,7 +778,6 @@ feign - flyway-cdi-extension geotools google-cloud @@ -798,7 +788,6 @@ grpc guava-modules - guice hazelcast apache-httpclient @@ -868,7 +857,6 @@ mybatis netflix-modules - netty orika osgi @@ -929,6 +917,7 @@ parent-java saas + server-modules spf4j @@ -973,8 +962,6 @@ spring-ejb-modules spring-exceptions - spring-freemarker - spring-integration spring-jenkins-pipeline @@ -1020,13 +1007,10 @@ twilio twitter4j - undertow - vertx-modules video-tutorials webrtc - wildfly xml xml-2 xstream diff --git a/apache-tomcat/pom.xml b/server-modules/apache-tomcat/pom.xml similarity index 86% rename from apache-tomcat/pom.xml rename to server-modules/apache-tomcat/pom.xml index 36487f2108..f9a0dfaf4a 100644 --- a/apache-tomcat/pom.xml +++ b/server-modules/apache-tomcat/pom.xml @@ -3,16 +3,13 @@ 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"> 4.0.0 - - com.baeldung apache-tomcat - 1.0.0-SNAPSHOT apache-tomcat pom com.baeldung - parent-modules + server-modules 1.0.0-SNAPSHOT @@ -31,4 +28,4 @@ - \ No newline at end of file + diff --git a/apache-tomcat/sso/.dockerignore b/server-modules/apache-tomcat/sso/.dockerignore similarity index 100% rename from apache-tomcat/sso/.dockerignore rename to server-modules/apache-tomcat/sso/.dockerignore diff --git a/apache-tomcat/sso/README.md b/server-modules/apache-tomcat/sso/README.md similarity index 100% rename from apache-tomcat/sso/README.md rename to server-modules/apache-tomcat/sso/README.md diff --git a/apache-tomcat/sso/docker-compose.yml b/server-modules/apache-tomcat/sso/docker-compose.yml similarity index 100% rename from apache-tomcat/sso/docker-compose.yml rename to server-modules/apache-tomcat/sso/docker-compose.yml diff --git a/apache-tomcat/sso/pom.xml b/server-modules/apache-tomcat/sso/pom.xml similarity index 100% rename from apache-tomcat/sso/pom.xml rename to server-modules/apache-tomcat/sso/pom.xml diff --git a/apache-tomcat/sso/res/conf/catalina.policy b/server-modules/apache-tomcat/sso/res/conf/catalina.policy similarity index 100% rename from apache-tomcat/sso/res/conf/catalina.policy rename to server-modules/apache-tomcat/sso/res/conf/catalina.policy diff --git a/apache-tomcat/sso/res/conf/catalina.properties b/server-modules/apache-tomcat/sso/res/conf/catalina.properties similarity index 100% rename from apache-tomcat/sso/res/conf/catalina.properties rename to server-modules/apache-tomcat/sso/res/conf/catalina.properties diff --git a/apache-tomcat/sso/res/conf/context.xml b/server-modules/apache-tomcat/sso/res/conf/context.xml similarity index 100% rename from apache-tomcat/sso/res/conf/context.xml rename to server-modules/apache-tomcat/sso/res/conf/context.xml diff --git a/apache-tomcat/sso/res/conf/jaspic-providers.xml b/server-modules/apache-tomcat/sso/res/conf/jaspic-providers.xml similarity index 100% rename from apache-tomcat/sso/res/conf/jaspic-providers.xml rename to server-modules/apache-tomcat/sso/res/conf/jaspic-providers.xml diff --git a/apache-tomcat/sso/res/conf/jaspic-providers.xsd b/server-modules/apache-tomcat/sso/res/conf/jaspic-providers.xsd similarity index 100% rename from apache-tomcat/sso/res/conf/jaspic-providers.xsd rename to server-modules/apache-tomcat/sso/res/conf/jaspic-providers.xsd diff --git a/apache-tomcat/sso/res/conf/logging.properties b/server-modules/apache-tomcat/sso/res/conf/logging.properties similarity index 100% rename from apache-tomcat/sso/res/conf/logging.properties rename to server-modules/apache-tomcat/sso/res/conf/logging.properties diff --git a/apache-tomcat/sso/res/conf/server.xml b/server-modules/apache-tomcat/sso/res/conf/server.xml similarity index 100% rename from apache-tomcat/sso/res/conf/server.xml rename to server-modules/apache-tomcat/sso/res/conf/server.xml diff --git a/apache-tomcat/sso/res/conf/tomcat-users.xml b/server-modules/apache-tomcat/sso/res/conf/tomcat-users.xml similarity index 100% rename from apache-tomcat/sso/res/conf/tomcat-users.xml rename to server-modules/apache-tomcat/sso/res/conf/tomcat-users.xml diff --git a/apache-tomcat/sso/res/conf/tomcat-users.xsd b/server-modules/apache-tomcat/sso/res/conf/tomcat-users.xsd similarity index 100% rename from apache-tomcat/sso/res/conf/tomcat-users.xsd rename to server-modules/apache-tomcat/sso/res/conf/tomcat-users.xsd diff --git a/apache-tomcat/sso/res/conf/web.xml b/server-modules/apache-tomcat/sso/res/conf/web.xml similarity index 100% rename from apache-tomcat/sso/res/conf/web.xml rename to server-modules/apache-tomcat/sso/res/conf/web.xml diff --git a/apache-tomcat/sso/webapps/ping/WEB-INF/web.xml b/server-modules/apache-tomcat/sso/webapps/ping/WEB-INF/web.xml similarity index 100% rename from apache-tomcat/sso/webapps/ping/WEB-INF/web.xml rename to server-modules/apache-tomcat/sso/webapps/ping/WEB-INF/web.xml diff --git a/apache-tomcat/sso/webapps/ping/index.html b/server-modules/apache-tomcat/sso/webapps/ping/index.html similarity index 100% rename from apache-tomcat/sso/webapps/ping/index.html rename to server-modules/apache-tomcat/sso/webapps/ping/index.html diff --git a/apache-tomcat/sso/webapps/ping/logging.html b/server-modules/apache-tomcat/sso/webapps/ping/logging.html similarity index 100% rename from apache-tomcat/sso/webapps/ping/logging.html rename to server-modules/apache-tomcat/sso/webapps/ping/logging.html diff --git a/apache-tomcat/sso/webapps/ping/logging_error.html b/server-modules/apache-tomcat/sso/webapps/ping/logging_error.html similarity index 100% rename from apache-tomcat/sso/webapps/ping/logging_error.html rename to server-modules/apache-tomcat/sso/webapps/ping/logging_error.html diff --git a/apache-tomcat/sso/webapps/ping/private/index.html b/server-modules/apache-tomcat/sso/webapps/ping/private/index.html similarity index 100% rename from apache-tomcat/sso/webapps/ping/private/index.html rename to server-modules/apache-tomcat/sso/webapps/ping/private/index.html diff --git a/apache-tomcat/sso/webapps/pong/WEB-INF/web.xml b/server-modules/apache-tomcat/sso/webapps/pong/WEB-INF/web.xml similarity index 100% rename from apache-tomcat/sso/webapps/pong/WEB-INF/web.xml rename to server-modules/apache-tomcat/sso/webapps/pong/WEB-INF/web.xml diff --git a/apache-tomcat/sso/webapps/pong/index.html b/server-modules/apache-tomcat/sso/webapps/pong/index.html similarity index 100% rename from apache-tomcat/sso/webapps/pong/index.html rename to server-modules/apache-tomcat/sso/webapps/pong/index.html diff --git a/apache-tomcat/sso/webapps/pong/private/index.html b/server-modules/apache-tomcat/sso/webapps/pong/private/index.html similarity index 100% rename from apache-tomcat/sso/webapps/pong/private/index.html rename to server-modules/apache-tomcat/sso/webapps/pong/private/index.html diff --git a/netty/README.md b/server-modules/netty/README.md similarity index 100% rename from netty/README.md rename to server-modules/netty/README.md diff --git a/netty/pom.xml b/server-modules/netty/pom.xml similarity index 91% rename from netty/pom.xml rename to server-modules/netty/pom.xml index c235ec9f4a..698b693a7d 100644 --- a/netty/pom.xml +++ b/server-modules/netty/pom.xml @@ -4,12 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 netty - 0.0.1-SNAPSHOT netty com.baeldung - parent-modules + server-modules 1.0.0-SNAPSHOT @@ -31,4 +30,4 @@ 2.4.0 - \ No newline at end of file + diff --git a/netty/src/main/java/com/baeldung/http/server/CustomHttpServerHandler.java b/server-modules/netty/src/main/java/com/baeldung/http/server/CustomHttpServerHandler.java similarity index 100% rename from netty/src/main/java/com/baeldung/http/server/CustomHttpServerHandler.java rename to server-modules/netty/src/main/java/com/baeldung/http/server/CustomHttpServerHandler.java diff --git a/netty/src/main/java/com/baeldung/http/server/HttpServer.java b/server-modules/netty/src/main/java/com/baeldung/http/server/HttpServer.java similarity index 100% rename from netty/src/main/java/com/baeldung/http/server/HttpServer.java rename to server-modules/netty/src/main/java/com/baeldung/http/server/HttpServer.java diff --git a/netty/src/main/java/com/baeldung/http/server/RequestUtils.java b/server-modules/netty/src/main/java/com/baeldung/http/server/RequestUtils.java similarity index 100% rename from netty/src/main/java/com/baeldung/http/server/RequestUtils.java rename to server-modules/netty/src/main/java/com/baeldung/http/server/RequestUtils.java diff --git a/netty/src/main/java/com/baeldung/netty/http2/Http2Util.java b/server-modules/netty/src/main/java/com/baeldung/netty/http2/Http2Util.java similarity index 100% rename from netty/src/main/java/com/baeldung/netty/http2/Http2Util.java rename to server-modules/netty/src/main/java/com/baeldung/netty/http2/Http2Util.java diff --git a/netty/src/main/java/com/baeldung/netty/http2/client/Http2ClientInitializer.java b/server-modules/netty/src/main/java/com/baeldung/netty/http2/client/Http2ClientInitializer.java similarity index 100% rename from netty/src/main/java/com/baeldung/netty/http2/client/Http2ClientInitializer.java rename to server-modules/netty/src/main/java/com/baeldung/netty/http2/client/Http2ClientInitializer.java diff --git a/netty/src/main/java/com/baeldung/netty/http2/client/Http2ClientResponseHandler.java b/server-modules/netty/src/main/java/com/baeldung/netty/http2/client/Http2ClientResponseHandler.java similarity index 100% rename from netty/src/main/java/com/baeldung/netty/http2/client/Http2ClientResponseHandler.java rename to server-modules/netty/src/main/java/com/baeldung/netty/http2/client/Http2ClientResponseHandler.java diff --git a/netty/src/main/java/com/baeldung/netty/http2/client/Http2SettingsHandler.java b/server-modules/netty/src/main/java/com/baeldung/netty/http2/client/Http2SettingsHandler.java similarity index 100% rename from netty/src/main/java/com/baeldung/netty/http2/client/Http2SettingsHandler.java rename to server-modules/netty/src/main/java/com/baeldung/netty/http2/client/Http2SettingsHandler.java diff --git a/netty/src/main/java/com/baeldung/netty/http2/server/Http2Server.java b/server-modules/netty/src/main/java/com/baeldung/netty/http2/server/Http2Server.java similarity index 100% rename from netty/src/main/java/com/baeldung/netty/http2/server/Http2Server.java rename to server-modules/netty/src/main/java/com/baeldung/netty/http2/server/Http2Server.java diff --git a/netty/src/main/java/com/baeldung/netty/http2/server/Http2ServerResponseHandler.java b/server-modules/netty/src/main/java/com/baeldung/netty/http2/server/Http2ServerResponseHandler.java similarity index 100% rename from netty/src/main/java/com/baeldung/netty/http2/server/Http2ServerResponseHandler.java rename to server-modules/netty/src/main/java/com/baeldung/netty/http2/server/Http2ServerResponseHandler.java diff --git a/netty/src/main/resources/logback.xml b/server-modules/netty/src/main/resources/logback.xml similarity index 100% rename from netty/src/main/resources/logback.xml rename to server-modules/netty/src/main/resources/logback.xml diff --git a/netty/src/test/java/com/baeldung/http/server/HttpServerLiveTest.java b/server-modules/netty/src/test/java/com/baeldung/http/server/HttpServerLiveTest.java similarity index 100% rename from netty/src/test/java/com/baeldung/http/server/HttpServerLiveTest.java rename to server-modules/netty/src/test/java/com/baeldung/http/server/HttpServerLiveTest.java diff --git a/netty/src/test/java/com/baeldung/http/server/ResponseAggregator.java b/server-modules/netty/src/test/java/com/baeldung/http/server/ResponseAggregator.java similarity index 100% rename from netty/src/test/java/com/baeldung/http/server/ResponseAggregator.java rename to server-modules/netty/src/test/java/com/baeldung/http/server/ResponseAggregator.java diff --git a/netty/src/test/java/com/baeldung/netty/Http2ClientLiveTest.java b/server-modules/netty/src/test/java/com/baeldung/netty/Http2ClientLiveTest.java similarity index 100% rename from netty/src/test/java/com/baeldung/netty/Http2ClientLiveTest.java rename to server-modules/netty/src/test/java/com/baeldung/netty/Http2ClientLiveTest.java diff --git a/server-modules/pom.xml b/server-modules/pom.xml new file mode 100644 index 0000000000..5e66256e3a --- /dev/null +++ b/server-modules/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + server-modules + server-modules + pom + + + parent-modules + com.baeldung + 1.0.0-SNAPSHOT + + + + apache-tomcat + netty + undertow + wildfly + + diff --git a/undertow/README.md b/server-modules/undertow/README.md similarity index 100% rename from undertow/README.md rename to server-modules/undertow/README.md diff --git a/undertow/pom.xml b/server-modules/undertow/pom.xml similarity index 94% rename from undertow/pom.xml rename to server-modules/undertow/pom.xml index 47e512daad..b40789f37d 100644 --- a/undertow/pom.xml +++ b/server-modules/undertow/pom.xml @@ -5,14 +5,12 @@ 4.0.0 com.baeldung.undertow undertow - 1.0-SNAPSHOT undertow jar - http://maven.apache.org com.baeldung - parent-modules + server-modules 1.0.0-SNAPSHOT @@ -52,4 +50,4 @@ 3.0.2 - \ No newline at end of file + diff --git a/undertow/src/main/java/com/baeldung/undertow/SimpleServer.java b/server-modules/undertow/src/main/java/com/baeldung/undertow/SimpleServer.java similarity index 100% rename from undertow/src/main/java/com/baeldung/undertow/SimpleServer.java rename to server-modules/undertow/src/main/java/com/baeldung/undertow/SimpleServer.java diff --git a/undertow/src/main/java/com/baeldung/undertow/ftp/FileServer.java b/server-modules/undertow/src/main/java/com/baeldung/undertow/ftp/FileServer.java similarity index 100% rename from undertow/src/main/java/com/baeldung/undertow/ftp/FileServer.java rename to server-modules/undertow/src/main/java/com/baeldung/undertow/ftp/FileServer.java diff --git a/undertow/src/main/java/com/baeldung/undertow/secure/CustomIdentityManager.java b/server-modules/undertow/src/main/java/com/baeldung/undertow/secure/CustomIdentityManager.java similarity index 100% rename from undertow/src/main/java/com/baeldung/undertow/secure/CustomIdentityManager.java rename to server-modules/undertow/src/main/java/com/baeldung/undertow/secure/CustomIdentityManager.java diff --git a/undertow/src/main/java/com/baeldung/undertow/secure/SecureServer.java b/server-modules/undertow/src/main/java/com/baeldung/undertow/secure/SecureServer.java similarity index 100% rename from undertow/src/main/java/com/baeldung/undertow/secure/SecureServer.java rename to server-modules/undertow/src/main/java/com/baeldung/undertow/secure/SecureServer.java diff --git a/undertow/src/main/java/com/baeldung/undertow/socket/SocketServer.java b/server-modules/undertow/src/main/java/com/baeldung/undertow/socket/SocketServer.java similarity index 100% rename from undertow/src/main/java/com/baeldung/undertow/socket/SocketServer.java rename to server-modules/undertow/src/main/java/com/baeldung/undertow/socket/SocketServer.java diff --git a/spring-freemarker/src/main/resources/logback.xml b/server-modules/undertow/src/main/resources/logback.xml similarity index 100% rename from spring-freemarker/src/main/resources/logback.xml rename to server-modules/undertow/src/main/resources/logback.xml diff --git a/wildfly/README.md b/server-modules/wildfly/README.md similarity index 100% rename from wildfly/README.md rename to server-modules/wildfly/README.md diff --git a/wildfly/pom.xml b/server-modules/wildfly/pom.xml similarity index 100% rename from wildfly/pom.xml rename to server-modules/wildfly/pom.xml diff --git a/wildfly/src/main/java/hello/Application.java b/server-modules/wildfly/src/main/java/hello/Application.java similarity index 100% rename from wildfly/src/main/java/hello/Application.java rename to server-modules/wildfly/src/main/java/hello/Application.java diff --git a/wildfly/src/main/java/hello/HelloController.java b/server-modules/wildfly/src/main/java/hello/HelloController.java similarity index 100% rename from wildfly/src/main/java/hello/HelloController.java rename to server-modules/wildfly/src/main/java/hello/HelloController.java diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml index a676a86d80..0f8465ce98 100644 --- a/spring-web-modules/pom.xml +++ b/spring-web-modules/pom.xml @@ -16,6 +16,7 @@ spring-5-mvc + spring-freemarker spring-mvc-basics spring-mvc-basics-2 spring-mvc-basics-3 @@ -51,4 +52,4 @@ spring-web-url - \ No newline at end of file + diff --git a/spring-freemarker/.gitignore b/spring-web-modules/spring-freemarker/.gitignore similarity index 100% rename from spring-freemarker/.gitignore rename to spring-web-modules/spring-freemarker/.gitignore diff --git a/spring-freemarker/README.md b/spring-web-modules/spring-freemarker/README.md similarity index 100% rename from spring-freemarker/README.md rename to spring-web-modules/spring-freemarker/README.md diff --git a/spring-freemarker/pom.xml b/spring-web-modules/spring-freemarker/pom.xml similarity index 100% rename from spring-freemarker/pom.xml rename to spring-web-modules/spring-freemarker/pom.xml diff --git a/spring-freemarker/src/main/java/com/baeldung/freemarker/config/SpringWebConfig.java b/spring-web-modules/spring-freemarker/src/main/java/com/baeldung/freemarker/config/SpringWebConfig.java similarity index 100% rename from spring-freemarker/src/main/java/com/baeldung/freemarker/config/SpringWebConfig.java rename to spring-web-modules/spring-freemarker/src/main/java/com/baeldung/freemarker/config/SpringWebConfig.java diff --git a/spring-freemarker/src/main/java/com/baeldung/freemarker/config/WebConfiguration.java b/spring-web-modules/spring-freemarker/src/main/java/com/baeldung/freemarker/config/WebConfiguration.java similarity index 100% rename from spring-freemarker/src/main/java/com/baeldung/freemarker/config/WebConfiguration.java rename to spring-web-modules/spring-freemarker/src/main/java/com/baeldung/freemarker/config/WebConfiguration.java diff --git a/spring-freemarker/src/main/java/com/baeldung/freemarker/controller/SpringController.java b/spring-web-modules/spring-freemarker/src/main/java/com/baeldung/freemarker/controller/SpringController.java similarity index 100% rename from spring-freemarker/src/main/java/com/baeldung/freemarker/controller/SpringController.java rename to spring-web-modules/spring-freemarker/src/main/java/com/baeldung/freemarker/controller/SpringController.java diff --git a/spring-freemarker/src/main/java/com/baeldung/freemarker/method/LastCharMethod.java b/spring-web-modules/spring-freemarker/src/main/java/com/baeldung/freemarker/method/LastCharMethod.java similarity index 100% rename from spring-freemarker/src/main/java/com/baeldung/freemarker/method/LastCharMethod.java rename to spring-web-modules/spring-freemarker/src/main/java/com/baeldung/freemarker/method/LastCharMethod.java diff --git a/spring-freemarker/src/main/java/com/baeldung/freemarker/model/Car.java b/spring-web-modules/spring-freemarker/src/main/java/com/baeldung/freemarker/model/Car.java similarity index 100% rename from spring-freemarker/src/main/java/com/baeldung/freemarker/model/Car.java rename to spring-web-modules/spring-freemarker/src/main/java/com/baeldung/freemarker/model/Car.java diff --git a/undertow/src/main/resources/logback.xml b/spring-web-modules/spring-freemarker/src/main/resources/logback.xml similarity index 100% rename from undertow/src/main/resources/logback.xml rename to spring-web-modules/spring-freemarker/src/main/resources/logback.xml diff --git a/spring-freemarker/src/main/webapp/WEB-INF/views/ftl/commons.ftl b/spring-web-modules/spring-freemarker/src/main/webapp/WEB-INF/views/ftl/commons.ftl similarity index 100% rename from spring-freemarker/src/main/webapp/WEB-INF/views/ftl/commons.ftl rename to spring-web-modules/spring-freemarker/src/main/webapp/WEB-INF/views/ftl/commons.ftl diff --git a/spring-freemarker/src/main/webapp/WEB-INF/views/ftl/index.ftl b/spring-web-modules/spring-freemarker/src/main/webapp/WEB-INF/views/ftl/index.ftl similarity index 100% rename from spring-freemarker/src/main/webapp/WEB-INF/views/ftl/index.ftl rename to spring-web-modules/spring-freemarker/src/main/webapp/WEB-INF/views/ftl/index.ftl diff --git a/spring-freemarker/src/main/webapp/WEB-INF/web.xml b/spring-web-modules/spring-freemarker/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from spring-freemarker/src/main/webapp/WEB-INF/web.xml rename to spring-web-modules/spring-freemarker/src/main/webapp/WEB-INF/web.xml diff --git a/spring-freemarker/src/test/java/com/baeldung/SpringContextTest.java b/spring-web-modules/spring-freemarker/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-freemarker/src/test/java/com/baeldung/SpringContextTest.java rename to spring-web-modules/spring-freemarker/src/test/java/com/baeldung/SpringContextTest.java From 979f49067b87f9cb66b356ddc6a744086fc84922 Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Thu, 24 Nov 2022 20:32:23 +0530 Subject: [PATCH 2/2] JAVA-15787 Moved spring-rector and spring-webflux-amqp to spring-reactive-modules --- pom.xml | 4 ---- spring-reactive-modules/pom.xml | 4 +++- .../spring-reactor}/README.md | 0 .../spring-reactor}/pom.xml | 0 .../src/main/java/com/baeldung/reactorbus/Config.java | 0 .../java/com/baeldung/reactorbus/NotificationApplication.java | 0 .../baeldung/reactorbus/consumer/NotificationConsumer.java | 0 .../reactorbus/controller/NotificationController.java | 0 .../java/com/baeldung/reactorbus/domain/NotificationData.java | 0 .../com/baeldung/reactorbus/service/NotificationService.java | 0 .../reactorbus/service/impl/NotificationServiceimpl.java | 0 .../spring-reactor}/src/main/resources/logback.xml | 0 .../src/test/java/com/baeldung/SpringContextTest.java | 0 .../reactorbus/NotificationApplicationIntegrationTest.java | 0 .../spring-webflux-amqp}/.gitignore | 0 .../spring-webflux-amqp}/README.md | 0 .../spring-webflux-amqp}/pom.xml | 0 .../java/com/baeldung/spring/amqp/AmqpReactiveController.java | 0 .../java/com/baeldung/spring/amqp/DestinationsConfig.java | 0 .../baeldung/spring/amqp/MessageListenerContainerFactory.java | 0 .../baeldung/spring/amqp/SpringWebfluxAmqpApplication.java | 0 .../spring-webflux-amqp}/src/main/resources/application.yml | 0 .../spring-webflux-amqp}/src/main/resources/logback.xml | 0 .../src/test/java/com/baeldung/SpringContextLiveTest.java | 0 .../com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java | 0 25 files changed, 3 insertions(+), 5 deletions(-) rename {spring-reactor => spring-reactive-modules/spring-reactor}/README.md (100%) rename {spring-reactor => spring-reactive-modules/spring-reactor}/pom.xml (100%) rename {spring-reactor => spring-reactive-modules/spring-reactor}/src/main/java/com/baeldung/reactorbus/Config.java (100%) rename {spring-reactor => spring-reactive-modules/spring-reactor}/src/main/java/com/baeldung/reactorbus/NotificationApplication.java (100%) rename {spring-reactor => spring-reactive-modules/spring-reactor}/src/main/java/com/baeldung/reactorbus/consumer/NotificationConsumer.java (100%) rename {spring-reactor => spring-reactive-modules/spring-reactor}/src/main/java/com/baeldung/reactorbus/controller/NotificationController.java (100%) rename {spring-reactor => spring-reactive-modules/spring-reactor}/src/main/java/com/baeldung/reactorbus/domain/NotificationData.java (100%) rename {spring-reactor => spring-reactive-modules/spring-reactor}/src/main/java/com/baeldung/reactorbus/service/NotificationService.java (100%) rename {spring-reactor => spring-reactive-modules/spring-reactor}/src/main/java/com/baeldung/reactorbus/service/impl/NotificationServiceimpl.java (100%) rename {spring-reactor => spring-reactive-modules/spring-reactor}/src/main/resources/logback.xml (100%) rename {spring-reactor => spring-reactive-modules/spring-reactor}/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-reactor => spring-reactive-modules/spring-reactor}/src/test/java/com/baeldung/reactorbus/NotificationApplicationIntegrationTest.java (100%) rename {spring-webflux-amqp => spring-reactive-modules/spring-webflux-amqp}/.gitignore (100%) rename {spring-webflux-amqp => spring-reactive-modules/spring-webflux-amqp}/README.md (100%) rename {spring-webflux-amqp => spring-reactive-modules/spring-webflux-amqp}/pom.xml (100%) rename {spring-webflux-amqp => spring-reactive-modules/spring-webflux-amqp}/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java (100%) rename {spring-webflux-amqp => spring-reactive-modules/spring-webflux-amqp}/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java (100%) rename {spring-webflux-amqp => spring-reactive-modules/spring-webflux-amqp}/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java (100%) rename {spring-webflux-amqp => spring-reactive-modules/spring-webflux-amqp}/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java (100%) rename {spring-webflux-amqp => spring-reactive-modules/spring-webflux-amqp}/src/main/resources/application.yml (100%) rename {spring-webflux-amqp => spring-reactive-modules/spring-webflux-amqp}/src/main/resources/logback.xml (100%) rename {spring-webflux-amqp => spring-reactive-modules/spring-webflux-amqp}/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-webflux-amqp => spring-reactive-modules/spring-webflux-amqp}/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java (100%) diff --git a/pom.xml b/pom.xml index 883f5b58f4..2a18379ca8 100644 --- a/pom.xml +++ b/pom.xml @@ -592,7 +592,6 @@ spring-protobuf spring-quartz - spring-reactor spring-remoting-modules spring-roo @@ -610,7 +609,6 @@ spring-vault spring-web-modules - spring-webflux-amqp spring-websockets static-analysis @@ -977,7 +975,6 @@ spring-protobuf spring-quartz - spring-reactor spring-remoting-modules spring-roo @@ -995,7 +992,6 @@ spring-vault spring-web-modules - spring-webflux-amqp spring-websockets static-analysis diff --git a/spring-reactive-modules/pom.xml b/spring-reactive-modules/pom.xml index 9822642a11..3352a00113 100644 --- a/spring-reactive-modules/pom.xml +++ b/spring-reactive-modules/pom.xml @@ -27,6 +27,8 @@ spring-5-reactive-security spring-reactive spring-reactive-exceptions + spring-reactor + spring-webflux-amqp @@ -62,4 +64,4 @@ - \ No newline at end of file + diff --git a/spring-reactor/README.md b/spring-reactive-modules/spring-reactor/README.md similarity index 100% rename from spring-reactor/README.md rename to spring-reactive-modules/spring-reactor/README.md diff --git a/spring-reactor/pom.xml b/spring-reactive-modules/spring-reactor/pom.xml similarity index 100% rename from spring-reactor/pom.xml rename to spring-reactive-modules/spring-reactor/pom.xml diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/Config.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/Config.java similarity index 100% rename from spring-reactor/src/main/java/com/baeldung/reactorbus/Config.java rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/Config.java diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/NotificationApplication.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/NotificationApplication.java similarity index 100% rename from spring-reactor/src/main/java/com/baeldung/reactorbus/NotificationApplication.java rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/NotificationApplication.java diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/consumer/NotificationConsumer.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/consumer/NotificationConsumer.java similarity index 100% rename from spring-reactor/src/main/java/com/baeldung/reactorbus/consumer/NotificationConsumer.java rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/consumer/NotificationConsumer.java diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/controller/NotificationController.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/controller/NotificationController.java similarity index 100% rename from spring-reactor/src/main/java/com/baeldung/reactorbus/controller/NotificationController.java rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/controller/NotificationController.java diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/domain/NotificationData.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/domain/NotificationData.java similarity index 100% rename from spring-reactor/src/main/java/com/baeldung/reactorbus/domain/NotificationData.java rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/domain/NotificationData.java diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/service/NotificationService.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/service/NotificationService.java similarity index 100% rename from spring-reactor/src/main/java/com/baeldung/reactorbus/service/NotificationService.java rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/service/NotificationService.java diff --git a/spring-reactor/src/main/java/com/baeldung/reactorbus/service/impl/NotificationServiceimpl.java b/spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/service/impl/NotificationServiceimpl.java similarity index 100% rename from spring-reactor/src/main/java/com/baeldung/reactorbus/service/impl/NotificationServiceimpl.java rename to spring-reactive-modules/spring-reactor/src/main/java/com/baeldung/reactorbus/service/impl/NotificationServiceimpl.java diff --git a/spring-reactor/src/main/resources/logback.xml b/spring-reactive-modules/spring-reactor/src/main/resources/logback.xml similarity index 100% rename from spring-reactor/src/main/resources/logback.xml rename to spring-reactive-modules/spring-reactor/src/main/resources/logback.xml diff --git a/spring-reactor/src/test/java/com/baeldung/SpringContextTest.java b/spring-reactive-modules/spring-reactor/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-reactor/src/test/java/com/baeldung/SpringContextTest.java rename to spring-reactive-modules/spring-reactor/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-reactor/src/test/java/com/baeldung/reactorbus/NotificationApplicationIntegrationTest.java b/spring-reactive-modules/spring-reactor/src/test/java/com/baeldung/reactorbus/NotificationApplicationIntegrationTest.java similarity index 100% rename from spring-reactor/src/test/java/com/baeldung/reactorbus/NotificationApplicationIntegrationTest.java rename to spring-reactive-modules/spring-reactor/src/test/java/com/baeldung/reactorbus/NotificationApplicationIntegrationTest.java diff --git a/spring-webflux-amqp/.gitignore b/spring-reactive-modules/spring-webflux-amqp/.gitignore similarity index 100% rename from spring-webflux-amqp/.gitignore rename to spring-reactive-modules/spring-webflux-amqp/.gitignore diff --git a/spring-webflux-amqp/README.md b/spring-reactive-modules/spring-webflux-amqp/README.md similarity index 100% rename from spring-webflux-amqp/README.md rename to spring-reactive-modules/spring-webflux-amqp/README.md diff --git a/spring-webflux-amqp/pom.xml b/spring-reactive-modules/spring-webflux-amqp/pom.xml similarity index 100% rename from spring-webflux-amqp/pom.xml rename to spring-reactive-modules/spring-webflux-amqp/pom.xml diff --git a/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java b/spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java similarity index 100% rename from spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java rename to spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/AmqpReactiveController.java diff --git a/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java b/spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java similarity index 100% rename from spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java rename to spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/DestinationsConfig.java diff --git a/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java b/spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java similarity index 100% rename from spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java rename to spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/MessageListenerContainerFactory.java diff --git a/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java b/spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java similarity index 100% rename from spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java rename to spring-reactive-modules/spring-webflux-amqp/src/main/java/com/baeldung/spring/amqp/SpringWebfluxAmqpApplication.java diff --git a/spring-webflux-amqp/src/main/resources/application.yml b/spring-reactive-modules/spring-webflux-amqp/src/main/resources/application.yml similarity index 100% rename from spring-webflux-amqp/src/main/resources/application.yml rename to spring-reactive-modules/spring-webflux-amqp/src/main/resources/application.yml diff --git a/spring-webflux-amqp/src/main/resources/logback.xml b/spring-reactive-modules/spring-webflux-amqp/src/main/resources/logback.xml similarity index 100% rename from spring-webflux-amqp/src/main/resources/logback.xml rename to spring-reactive-modules/spring-webflux-amqp/src/main/resources/logback.xml diff --git a/spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-reactive-modules/spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-reactive-modules/spring-webflux-amqp/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java b/spring-reactive-modules/spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java similarity index 100% rename from spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java rename to spring-reactive-modules/spring-webflux-amqp/src/test/java/com/baeldung/spring/amqp/SpringWebfluxAmqpLiveTest.java