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