From 46499a24192d8a124741077c81cc91f8468249e8 Mon Sep 17 00:00:00 2001 From: freelansam <79205526+freelansam@users.noreply.github.com> Date: Fri, 26 Aug 2022 16:20:12 +0530 Subject: [PATCH] JAVA-13823: Review module names (#12628) * JAVA-13823: rename struts-2 to struts * JAVA-13823: rename spring-cloud-bus submodules * JAVA-13823: rename spring-cloud-config submodules * JAVA-13823: rename spring-cloud-data-flow submodules * JAVA-13823: rename spring-cloud-hystrix submodules * JAVA-13823: rename spring-cloud-netflix-sidecar submodules * JAVA-13823: rename spring-cloud-zookeeper submodules * JAVA-13823: rename spring-cloud-zuul-fallback submodules * JAVA-13823: rename spring-security-web-angular submodules Co-authored-by: Dhawal Kapil --- pom.xml | 2 + spring-cloud-modules/spring-cloud-bus/pom.xml | 4 +- .../pom.xml | 4 +- .../SpringCloudConfigClientApplication.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../pom.xml | 4 +- .../SpringCloudConfigServerApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/config-server.jks | Bin .../src/main/resources/logback.xml | 0 ...onfigServerApplicationIntegrationTest.java | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../spring-cloud-config/pom.xml | 4 +- .../pom.xml | 4 +- .../cloud/config/client/ConfigClient.java | 0 .../src/main/resources/application.properties | 0 .../config/client/SpringContextLiveTest.java | 0 .../config-client-development.properties | 0 .../config-client-production.properties | 0 .../pom.xml | 4 +- .../cloud/config/server/ConfigServer.java | 0 .../config/server/SecurityConfiguration.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/config-server.jks | Bin .../config/server/SpringContextTest.java | 0 .../src/test/resources/application.properties | 0 .../spring-cloud-data-flow/pom.xml | 4 +- .../README.md | 0 .../pom.xml | 4 +- .../spring/cloud/PiApproximation.java | 0 .../README.md | 0 .../pom.xml | 4 +- .../spring/cloud/BatchJobApplication.java | 0 .../spring/cloud/JobConfiguration.java | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../BatchJobApplicationIntegrationTest.java | 0 .../spring-cloud-hystrix/pom.xml | 6 +- .../pom.xml | 4 +- .../hystrix/rest/consumer/GreetingClient.java | 0 .../rest/consumer/GreetingController.java | 0 .../RestConsumerFeignApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../resources/templates/greeting-view.html | 0 .../rest/consumer/SpringContextTest.java | 0 .../pom.xml | 4 +- .../rest/consumer/GreetingController.java | 0 .../rest/consumer/GreetingService.java | 0 .../consumer/RestConsumerApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../resources/templates/greeting-view.html | 0 .../rest/consumer/SpringContextTest.java | 0 .../pom.xml | 4 +- .../rest/producer/GreetingController.java | 0 .../rest/producer/GreetingControllerImpl.java | 0 .../producer/RestProducerApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../rest/producer/SpringContextTest.java | 0 .../spring-cloud-netflix-sidecar/pom.xml | 4 +- .../nodejs/hello.js | 0 .../pom.xml | 4 +- .../cloud/sidecar/SidecarApplication.java | 0 .../src/main/resources/application.yml | 0 .../cloud/sidecar/SpringContextTest.java | 0 .../pom.xml | 4 +- .../baeldung/cloud/echo/EchoApplication.java | 0 .../src/main/resources/application.yml | 0 .../cloud/echo/SpringContextTest.java | 0 .../spring-cloud-zookeeper/pom.xml | 4 +- .../pom.xml | 4 +- .../cloud/greeting/GreetingApplication.java | 0 .../cloud/greeting/GreetingController.java | 0 .../cloud/greeting/HelloWorldClient.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../resources/templates/greeting-view.html | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../pom.xml | 4 +- .../helloworld/HelloWorldApplication.java | 0 .../helloworld/HelloWorldController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../cloud/helloworld/SpringContextTest.java | 0 .../spring-cloud-zuul-fallback/pom.xml | 4 +- .../pom.xml | 4 +- .../apigateway/ApiGatewayApplication.java | 0 .../fallback/GatewayClientResponse.java | 0 .../fallback/GatewayServiceFallback.java | 0 .../fallback/WeatherServiceFallback.java | 0 .../src/main/resources/application.yml | 0 .../ApiGatewayApplicationIntegrationTest.java | 0 .../GatewayServiceFallbackUnitTest.java | 0 .../WeatherServiceFallbackUnitTest.java | 0 .../src/test/resources/logback.xml | 0 .../pom.xml | 4 +- .../weatherservice/WeatherController.java | 0 .../WeatherServiceApplication.java | 0 .../src/main/resources/application.yml | 0 .../WeatherControllerIntegrationTest.java | 0 ...therServiceApplicationIntegrationTest.java | 0 .../spring-security-web-angular/pom.xml | 2 +- .../anguarjs/app.js | 0 .../anguarjs/home/home.controller.js | 0 .../anguarjs/home/home.view.html | 0 .../anguarjs/index.html | 0 .../anguarjs/login/login.controller.js | 0 .../anguarjs/login/login.view.html | 0 .../angular2/app.css | 0 .../angular2/app/app.component.html | 0 .../angular2/app/app.component.ts | 0 .../angular2/app/app.module.ts | 0 .../angular2/app/app.routing.ts | 0 .../angular2/app/home/home.component.html | 0 .../angular2/app/home/home.component.ts | 0 .../angular2/app/login/login.component.html | 0 .../angular2/app/login/login.component.ts | 0 .../angular2/app/main.ts | 0 .../angular2/index.html | 0 .../angular2/package.json | 0 .../angular2/systemjs.config.js | 0 .../angular2/tsconfig.json | 0 .../angular4/.angular-cli.json | 0 .../angular4/package.json | 0 .../angular4/src/app/app.component.html | 0 .../angular4/src/app/app.component.ts | 0 .../angular4/src/app/app.module.ts | 0 .../angular4/src/app/app.routing.ts | 0 .../angular4/src/app/home/home.component.html | 0 .../angular4/src/app/home/home.component.ts | 0 .../src/app/login/login.component.html | 0 .../angular4/src/app/login/login.component.ts | 0 .../angular4/src/index.html | 0 .../angular4/src/main.ts | 0 .../angular4/src/polyfills.ts | 0 .../angular4/src/styles.css | 0 .../angular4/src/tsconfig.app.json | 0 .../angular4/tsconfig.json | 0 .../angular4/tslint.json | 0 .../angular5/.angular-cli.json | 0 .../angular5/package.json | 0 .../angular5/src/app/app.component.html | 0 .../angular5/src/app/app.component.ts | 0 .../angular5/src/app/app.module.ts | 0 .../angular5/src/app/app.routing.ts | 0 .../angular5/src/app/home/home.component.html | 0 .../angular5/src/app/home/home.component.ts | 0 .../src/app/login/login.component.html | 0 .../angular5/src/app/login/login.component.ts | 0 .../angular5/src/index.html | 0 .../angular5/src/main.ts | 0 .../angular5/src/polyfills.ts | 0 .../angular5/src/styles.css | 0 .../angular5/src/tsconfig.app.json | 0 .../angular5/tsconfig.json | 0 .../angular5/tslint.json | 0 .../angular6/angular.json | 0 .../angular6/package.json | 0 .../angular6/src/app/app.component.html | 0 .../angular6/src/app/app.component.ts | 0 .../angular6/src/app/app.module.ts | 0 .../angular6/src/app/app.routing.ts | 0 .../angular6/src/app/home/home.component.html | 0 .../angular6/src/app/home/home.component.ts | 0 .../src/app/login/login.component.html | 0 .../angular6/src/app/login/login.component.ts | 0 .../angular6/src/index.html | 0 .../angular6/src/main.ts | 0 .../angular6/src/polyfills.ts | 0 .../angular6/src/styles.css | 0 .../angular6/src/tsconfig.app.json | 0 .../angular6/tsconfig.json | 0 .../angular6/tslint.json | 0 .../pom.xml | 4 +- .../SpringBootSecurityApplication.java | 0 .../config/BasicAuthConfiguration.java | 0 .../controller/UserController.java | 0 .../springbootsecurityrest/vo/User.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 ...BasicAuthConfigurationIntegrationTest.java | 0 struts/README.md | 7 ++ struts/WebContent/WEB-INF/web.xml | 12 +++ struts/WebContent/input.jsp | 21 +++++ struts/WebContent/result.jsp | 11 +++ struts/pom.xml | 76 ++++++++++++++++++ .../java/com/baeldung/struts/CarAction.java | 37 +++++++++ .../baeldung/struts/CarMessageService.java | 18 +++++ struts/src/main/resources/logback.xml | 13 +++ .../baeldung/struts/test/CarActionTest.java | 29 +++++++ 195 files changed, 274 insertions(+), 48 deletions(-) rename spring-cloud-modules/spring-cloud-bus/{spring-cloud-config-client => spring-cloud-bus-client}/pom.xml (94%) rename spring-cloud-modules/spring-cloud-bus/{spring-cloud-config-client => spring-cloud-bus-client}/src/main/java/com/baeldung/SpringCloudConfigClientApplication.java (100%) rename spring-cloud-modules/spring-cloud-bus/{spring-cloud-config-client => spring-cloud-bus-client}/src/main/resources/application.yml (100%) rename spring-cloud-modules/spring-cloud-bus/{spring-cloud-config-client => spring-cloud-bus-client}/src/main/resources/logback.xml (100%) rename spring-cloud-modules/spring-cloud-bus/{spring-cloud-config-client => spring-cloud-bus-client}/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename spring-cloud-modules/spring-cloud-bus/{spring-cloud-config-server => spring-cloud-bus-server}/pom.xml (94%) rename spring-cloud-modules/spring-cloud-bus/{spring-cloud-config-server => spring-cloud-bus-server}/src/main/java/com/baeldung/SpringCloudConfigServerApplication.java (100%) rename spring-cloud-modules/spring-cloud-bus/{spring-cloud-config-server => spring-cloud-bus-server}/src/main/resources/application.properties (100%) rename spring-cloud-modules/spring-cloud-bus/{spring-cloud-config-server => spring-cloud-bus-server}/src/main/resources/config-server.jks (100%) rename spring-cloud-modules/spring-cloud-bus/{spring-cloud-config-server => spring-cloud-bus-server}/src/main/resources/logback.xml (100%) rename spring-cloud-modules/spring-cloud-bus/{spring-cloud-config-server => spring-cloud-bus-server}/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java (100%) rename spring-cloud-modules/spring-cloud-bus/{spring-cloud-config-server => spring-cloud-bus-server}/src/test/java/com/baeldung/SpringContextTest.java (100%) rename spring-cloud-modules/spring-cloud-config/{client => spring-cloud-config-client}/pom.xml (92%) rename spring-cloud-modules/spring-cloud-config/{client => spring-cloud-config-client}/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java (100%) rename spring-cloud-modules/spring-cloud-config/{client => spring-cloud-config-client}/src/main/resources/application.properties (100%) rename spring-cloud-modules/spring-cloud-config/{client => spring-cloud-config-client}/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java (100%) rename spring-cloud-modules/spring-cloud-config/{config-repo => spring-cloud-config-repo}/config-client-development.properties (100%) rename spring-cloud-modules/spring-cloud-config/{config-repo => spring-cloud-config-repo}/config-client-production.properties (100%) rename spring-cloud-modules/spring-cloud-config/{server => spring-cloud-config-server}/pom.xml (93%) rename spring-cloud-modules/spring-cloud-config/{server => spring-cloud-config-server}/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java (100%) rename spring-cloud-modules/spring-cloud-config/{server => spring-cloud-config-server}/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java (100%) rename spring-cloud-modules/spring-cloud-config/{server => spring-cloud-config-server}/src/main/resources/application.properties (100%) rename spring-cloud-modules/spring-cloud-config/{server => spring-cloud-config-server}/src/main/resources/config-server.jks (100%) rename spring-cloud-modules/spring-cloud-config/{server => spring-cloud-config-server}/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java (100%) rename spring-cloud-modules/spring-cloud-config/{server => spring-cloud-config-server}/src/test/resources/application.properties (100%) rename spring-cloud-modules/spring-cloud-data-flow/{apache-spark-job => spring-cloud-data-flow-apache-spark-job}/README.md (100%) rename spring-cloud-modules/spring-cloud-data-flow/{apache-spark-job => spring-cloud-data-flow-apache-spark-job}/pom.xml (90%) rename spring-cloud-modules/spring-cloud-data-flow/{apache-spark-job => spring-cloud-data-flow-apache-spark-job}/src/main/java/com/baeldung/spring/cloud/PiApproximation.java (100%) rename spring-cloud-modules/spring-cloud-data-flow/{batch-job => spring-cloud-data-flow-batch-job}/README.md (100%) rename spring-cloud-modules/spring-cloud-data-flow/{batch-job => spring-cloud-data-flow-batch-job}/pom.xml (93%) rename spring-cloud-modules/spring-cloud-data-flow/{batch-job => spring-cloud-data-flow-batch-job}/src/main/java/com/baeldung/spring/cloud/BatchJobApplication.java (100%) rename spring-cloud-modules/spring-cloud-data-flow/{batch-job => spring-cloud-data-flow-batch-job}/src/main/java/com/baeldung/spring/cloud/JobConfiguration.java (100%) rename spring-cloud-modules/spring-cloud-data-flow/{batch-job => spring-cloud-data-flow-batch-job}/src/main/resources/logback.xml (100%) rename spring-cloud-modules/spring-cloud-data-flow/{batch-job => spring-cloud-data-flow-batch-job}/src/test/java/com/baeldung/SpringContextTest.java (100%) rename spring-cloud-modules/spring-cloud-data-flow/{batch-job => spring-cloud-data-flow-batch-job}/src/test/java/com/baeldung/spring/cloud/BatchJobApplicationIntegrationTest.java (100%) rename spring-cloud-modules/spring-cloud-hystrix/{feign-rest-consumer => spring-cloud-hystrix-feign-rest-consumer}/pom.xml (95%) rename spring-cloud-modules/spring-cloud-hystrix/{feign-rest-consumer => spring-cloud-hystrix-feign-rest-consumer}/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java (100%) rename spring-cloud-modules/spring-cloud-hystrix/{feign-rest-consumer => spring-cloud-hystrix-feign-rest-consumer}/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java (100%) rename spring-cloud-modules/spring-cloud-hystrix/{feign-rest-consumer => spring-cloud-hystrix-feign-rest-consumer}/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java (100%) rename spring-cloud-modules/spring-cloud-hystrix/{feign-rest-consumer => spring-cloud-hystrix-feign-rest-consumer}/src/main/resources/application.properties (100%) rename spring-cloud-modules/spring-cloud-hystrix/{feign-rest-consumer => spring-cloud-hystrix-feign-rest-consumer}/src/main/resources/logback.xml (100%) rename spring-cloud-modules/spring-cloud-hystrix/{feign-rest-consumer => spring-cloud-hystrix-feign-rest-consumer}/src/main/resources/templates/greeting-view.html (100%) rename spring-cloud-modules/spring-cloud-hystrix/{feign-rest-consumer => spring-cloud-hystrix-feign-rest-consumer}/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java (100%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-consumer => spring-cloud-hystrix-rest-consumer}/pom.xml (95%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-consumer => spring-cloud-hystrix-rest-consumer}/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java (100%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-consumer => spring-cloud-hystrix-rest-consumer}/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java (100%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-consumer => spring-cloud-hystrix-rest-consumer}/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java (100%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-consumer => spring-cloud-hystrix-rest-consumer}/src/main/resources/application.properties (100%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-consumer => spring-cloud-hystrix-rest-consumer}/src/main/resources/logback.xml (100%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-consumer => spring-cloud-hystrix-rest-consumer}/src/main/resources/templates/greeting-view.html (100%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-consumer => spring-cloud-hystrix-rest-consumer}/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java (100%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-producer => spring-cloud-hystrix-rest-producer}/pom.xml (90%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-producer => spring-cloud-hystrix-rest-producer}/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java (100%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-producer => spring-cloud-hystrix-rest-producer}/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java (100%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-producer => spring-cloud-hystrix-rest-producer}/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java (100%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-producer => spring-cloud-hystrix-rest-producer}/src/main/resources/application.properties (100%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-producer => spring-cloud-hystrix-rest-producer}/src/main/resources/logback.xml (100%) rename spring-cloud-modules/spring-cloud-hystrix/{rest-producer => spring-cloud-hystrix-rest-producer}/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java (100%) rename spring-cloud-modules/spring-cloud-netflix-sidecar/{sidecar-demo => spring-cloud-netflix-sidecar-demo}/nodejs/hello.js (100%) rename spring-cloud-modules/spring-cloud-netflix-sidecar/{sidecar-demo => spring-cloud-netflix-sidecar-demo}/pom.xml (94%) rename spring-cloud-modules/spring-cloud-netflix-sidecar/{sidecar-demo => spring-cloud-netflix-sidecar-demo}/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java (100%) rename spring-cloud-modules/spring-cloud-netflix-sidecar/{sidecar-demo => spring-cloud-netflix-sidecar-demo}/src/main/resources/application.yml (100%) rename spring-cloud-modules/spring-cloud-netflix-sidecar/{sidecar-demo => spring-cloud-netflix-sidecar-demo}/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java (100%) rename spring-cloud-modules/spring-cloud-netflix-sidecar/{echo-demo => spring-cloud-netflix-sidecar-echo-demo}/pom.xml (93%) rename spring-cloud-modules/spring-cloud-netflix-sidecar/{echo-demo => spring-cloud-netflix-sidecar-echo-demo}/src/main/java/com/baeldung/cloud/echo/EchoApplication.java (100%) rename spring-cloud-modules/spring-cloud-netflix-sidecar/{echo-demo => spring-cloud-netflix-sidecar-echo-demo}/src/main/resources/application.yml (100%) rename spring-cloud-modules/spring-cloud-netflix-sidecar/{echo-demo => spring-cloud-netflix-sidecar-echo-demo}/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java (100%) rename spring-cloud-modules/spring-cloud-zookeeper/{Greeting => spring-cloud-zookeeper-greeting}/pom.xml (96%) rename spring-cloud-modules/spring-cloud-zookeeper/{Greeting => spring-cloud-zookeeper-greeting}/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java (100%) rename spring-cloud-modules/spring-cloud-zookeeper/{Greeting => spring-cloud-zookeeper-greeting}/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java (100%) rename spring-cloud-modules/spring-cloud-zookeeper/{Greeting => spring-cloud-zookeeper-greeting}/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java (100%) rename spring-cloud-modules/spring-cloud-zookeeper/{Greeting => spring-cloud-zookeeper-greeting}/src/main/resources/application.yml (100%) rename spring-cloud-modules/spring-cloud-zookeeper/{Greeting => spring-cloud-zookeeper-greeting}/src/main/resources/logback.xml (100%) rename spring-cloud-modules/spring-cloud-zookeeper/{Greeting => spring-cloud-zookeeper-greeting}/src/main/resources/templates/greeting-view.html (100%) rename spring-cloud-modules/spring-cloud-zookeeper/{Greeting => spring-cloud-zookeeper-greeting}/src/test/java/com/baeldung/SpringContextTest.java (100%) rename spring-cloud-modules/spring-cloud-zookeeper/{HelloWorld => spring-cloud-zookeeper-helloworld}/pom.xml (95%) rename spring-cloud-modules/spring-cloud-zookeeper/{HelloWorld => spring-cloud-zookeeper-helloworld}/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java (100%) rename spring-cloud-modules/spring-cloud-zookeeper/{HelloWorld => spring-cloud-zookeeper-helloworld}/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java (100%) rename spring-cloud-modules/spring-cloud-zookeeper/{HelloWorld => spring-cloud-zookeeper-helloworld}/src/main/resources/application.yml (100%) rename spring-cloud-modules/spring-cloud-zookeeper/{HelloWorld => spring-cloud-zookeeper-helloworld}/src/main/resources/logback.xml (100%) rename spring-cloud-modules/spring-cloud-zookeeper/{HelloWorld => spring-cloud-zookeeper-helloworld}/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{api-gateway => spring-cloud-zuul-fallback-api-gateway}/pom.xml (93%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{api-gateway => spring-cloud-zuul-fallback-api-gateway}/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{api-gateway => spring-cloud-zuul-fallback-api-gateway}/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{api-gateway => spring-cloud-zuul-fallback-api-gateway}/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{api-gateway => spring-cloud-zuul-fallback-api-gateway}/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{api-gateway => spring-cloud-zuul-fallback-api-gateway}/src/main/resources/application.yml (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{api-gateway => spring-cloud-zuul-fallback-api-gateway}/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{api-gateway => spring-cloud-zuul-fallback-api-gateway}/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{api-gateway => spring-cloud-zuul-fallback-api-gateway}/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{api-gateway => spring-cloud-zuul-fallback-api-gateway}/src/test/resources/logback.xml (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{weather-service => spring-cloud-zuul-fallback-weather-service}/pom.xml (92%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{weather-service => spring-cloud-zuul-fallback-weather-service}/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{weather-service => spring-cloud-zuul-fallback-weather-service}/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{weather-service => spring-cloud-zuul-fallback-weather-service}/src/main/resources/application.yml (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{weather-service => spring-cloud-zuul-fallback-weather-service}/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java (100%) rename spring-cloud-modules/spring-cloud-zuul-fallback/{weather-service => spring-cloud-zuul-fallback-weather-service}/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/anguarjs/app.js (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/anguarjs/home/home.controller.js (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/anguarjs/home/home.view.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/anguarjs/index.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/anguarjs/login/login.controller.js (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/anguarjs/login/login.view.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/app.css (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/app/app.component.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/app/app.component.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/app/app.module.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/app/app.routing.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/app/home/home.component.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/app/home/home.component.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/app/login/login.component.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/app/login/login.component.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/app/main.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/index.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/package.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/systemjs.config.js (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular2/tsconfig.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/.angular-cli.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/package.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/src/app/app.component.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/src/app/app.component.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/src/app/app.module.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/src/app/app.routing.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/src/app/home/home.component.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/src/app/home/home.component.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/src/app/login/login.component.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/src/app/login/login.component.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/src/index.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/src/main.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/src/polyfills.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/src/styles.css (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/src/tsconfig.app.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/tsconfig.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular4/tslint.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/.angular-cli.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/package.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/src/app/app.component.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/src/app/app.component.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/src/app/app.module.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/src/app/app.routing.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/src/app/home/home.component.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/src/app/home/home.component.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/src/app/login/login.component.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/src/app/login/login.component.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/src/index.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/src/main.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/src/polyfills.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/src/styles.css (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/src/tsconfig.app.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/tsconfig.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular5/tslint.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/angular.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/package.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/src/app/app.component.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/src/app/app.component.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/src/app/app.module.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/src/app/app.routing.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/src/app/home/home.component.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/src/app/home/home.component.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/src/app/login/login.component.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/src/app/login/login.component.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/src/index.html (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/src/main.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/src/polyfills.ts (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/src/styles.css (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/src/tsconfig.app.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/tsconfig.json (100%) rename spring-security-modules/spring-security-web-angular/{client => spring-security-web-angular-client}/angular6/tslint.json (100%) rename spring-security-modules/spring-security-web-angular/{server => spring-security-web-angular-server}/pom.xml (95%) rename spring-security-modules/spring-security-web-angular/{server => spring-security-web-angular-server}/src/main/java/com/baeldung/springbootsecurityrest/basicauth/SpringBootSecurityApplication.java (100%) rename spring-security-modules/spring-security-web-angular/{server => spring-security-web-angular-server}/src/main/java/com/baeldung/springbootsecurityrest/basicauth/config/BasicAuthConfiguration.java (100%) rename spring-security-modules/spring-security-web-angular/{server => spring-security-web-angular-server}/src/main/java/com/baeldung/springbootsecurityrest/controller/UserController.java (100%) rename spring-security-modules/spring-security-web-angular/{server => spring-security-web-angular-server}/src/main/java/com/baeldung/springbootsecurityrest/vo/User.java (100%) rename spring-security-modules/spring-security-web-angular/{server => spring-security-web-angular-server}/src/main/resources/application.properties (100%) rename spring-security-modules/spring-security-web-angular/{server => spring-security-web-angular-server}/src/main/resources/logback.xml (100%) rename spring-security-modules/spring-security-web-angular/{server => spring-security-web-angular-server}/src/test/java/com/baeldung/SpringContextTest.java (100%) rename spring-security-modules/spring-security-web-angular/{server => spring-security-web-angular-server}/src/test/java/com/baeldung/springbootsecurityrest/BasicAuthConfigurationIntegrationTest.java (100%) create mode 100644 struts/README.md create mode 100644 struts/WebContent/WEB-INF/web.xml create mode 100644 struts/WebContent/input.jsp create mode 100644 struts/WebContent/result.jsp create mode 100644 struts/pom.xml create mode 100644 struts/src/main/java/com/baeldung/struts/CarAction.java create mode 100644 struts/src/main/java/com/baeldung/struts/CarMessageService.java create mode 100644 struts/src/main/resources/logback.xml create mode 100644 struts/src/test/java/com/baeldung/struts/test/CarActionTest.java diff --git a/pom.xml b/pom.xml index f0a0e8e0d6..0fb651ed34 100644 --- a/pom.xml +++ b/pom.xml @@ -617,6 +617,7 @@ static-analysis stripe + struts tensorflow-java testing-modules @@ -1008,6 +1009,7 @@ static-analysis stripe + struts tensorflow-java testing-modules diff --git a/spring-cloud-modules/spring-cloud-bus/pom.xml b/spring-cloud-modules/spring-cloud-bus/pom.xml index 4be1a60062..514060a400 100644 --- a/spring-cloud-modules/spring-cloud-bus/pom.xml +++ b/spring-cloud-modules/spring-cloud-bus/pom.xml @@ -16,8 +16,8 @@ - spring-cloud-config-client - spring-cloud-config-server + spring-cloud-bus-client + spring-cloud-bus-server diff --git a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/pom.xml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-client/pom.xml similarity index 94% rename from spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/pom.xml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-client/pom.xml index 87889570a3..0c6212c877 100644 --- a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/pom.xml +++ b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-client/pom.xml @@ -3,8 +3,8 @@ 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 - spring-cloud-config-client - spring-cloud-config-client + spring-cloud-bus-client + spring-cloud-bus-client jar Demo Spring Cloud Config Client diff --git a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/java/com/baeldung/SpringCloudConfigClientApplication.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-client/src/main/java/com/baeldung/SpringCloudConfigClientApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/java/com/baeldung/SpringCloudConfigClientApplication.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-client/src/main/java/com/baeldung/SpringCloudConfigClientApplication.java diff --git a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-client/src/main/resources/application.yml similarity index 100% rename from spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-client/src/main/resources/application.yml diff --git a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-client/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-client/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-client/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bus/spring-cloud-config-client/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-client/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/pom.xml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/pom.xml similarity index 94% rename from spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/pom.xml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/pom.xml index e6439fa56a..18c758a2e1 100644 --- a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/pom.xml +++ b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/pom.xml @@ -3,8 +3,8 @@ 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 - spring-cloud-config-server - spring-cloud-config-server + spring-cloud-bus-server + spring-cloud-bus-server jar Demo Spring Cloud Config Server diff --git a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/java/com/baeldung/SpringCloudConfigServerApplication.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/src/main/java/com/baeldung/SpringCloudConfigServerApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/java/com/baeldung/SpringCloudConfigServerApplication.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/src/main/java/com/baeldung/SpringCloudConfigServerApplication.java diff --git a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/src/main/resources/application.properties diff --git a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/config-server.jks b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/src/main/resources/config-server.jks similarity index 100% rename from spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/config-server.jks rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/src/main/resources/config-server.jks diff --git a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/src/test/java/com/baeldung/SpringCloudConfigServerApplicationIntegrationTest.java diff --git a/spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-bus/spring-cloud-config-server/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-bus/spring-cloud-bus-server/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-config/pom.xml b/spring-cloud-modules/spring-cloud-config/pom.xml index fc9a989844..965f65f61b 100644 --- a/spring-cloud-modules/spring-cloud-config/pom.xml +++ b/spring-cloud-modules/spring-cloud-config/pom.xml @@ -16,8 +16,8 @@ - server - client + spring-cloud-config-server + spring-cloud-config-client diff --git a/spring-cloud-modules/spring-cloud-config/client/pom.xml b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-client/pom.xml similarity index 92% rename from spring-cloud-modules/spring-cloud-config/client/pom.xml rename to spring-cloud-modules/spring-cloud-config/spring-cloud-config-client/pom.xml index 0f463b6d6d..5b7ff9640d 100644 --- a/spring-cloud-modules/spring-cloud-config/client/pom.xml +++ b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-client/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - client - client + spring-cloud-config-client + spring-cloud-config-client com.baeldung.spring.cloud diff --git a/spring-cloud-modules/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java similarity index 100% rename from spring-cloud-modules/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java rename to spring-cloud-modules/spring-cloud-config/spring-cloud-config-client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java diff --git a/spring-cloud-modules/spring-cloud-config/client/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-client/src/main/resources/application.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-config/client/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-config/spring-cloud-config-client/src/main/resources/application.properties diff --git a/spring-cloud-modules/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-config/spring-cloud-config-client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java diff --git a/spring-cloud-modules/spring-cloud-config/config-repo/config-client-development.properties b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-repo/config-client-development.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-config/config-repo/config-client-development.properties rename to spring-cloud-modules/spring-cloud-config/spring-cloud-config-repo/config-client-development.properties diff --git a/spring-cloud-modules/spring-cloud-config/config-repo/config-client-production.properties b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-repo/config-client-production.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-config/config-repo/config-client-production.properties rename to spring-cloud-modules/spring-cloud-config/spring-cloud-config-repo/config-client-production.properties diff --git a/spring-cloud-modules/spring-cloud-config/server/pom.xml b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/pom.xml similarity index 93% rename from spring-cloud-modules/spring-cloud-config/server/pom.xml rename to spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/pom.xml index b41277113f..8920744a45 100644 --- a/spring-cloud-modules/spring-cloud-config/server/pom.xml +++ b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/pom.xml @@ -3,8 +3,8 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - server - server + spring-cloud-config-server + spring-cloud-config-server com.baeldung.spring.cloud diff --git a/spring-cloud-modules/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java similarity index 100% rename from spring-cloud-modules/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java rename to spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java diff --git a/spring-cloud-modules/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java similarity index 100% rename from spring-cloud-modules/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java rename to spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java diff --git a/spring-cloud-modules/spring-cloud-config/server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-config/server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/src/main/resources/application.properties diff --git a/spring-cloud-modules/spring-cloud-config/server/src/main/resources/config-server.jks b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/src/main/resources/config-server.jks similarity index 100% rename from spring-cloud-modules/spring-cloud-config/server/src/main/resources/config-server.jks rename to spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/src/main/resources/config-server.jks diff --git a/spring-cloud-modules/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-config/server/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/src/test/resources/application.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-config/server/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-config/spring-cloud-config-server/src/test/resources/application.properties diff --git a/spring-cloud-modules/spring-cloud-data-flow/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/pom.xml index 25a70642ec..a9d9a22a84 100644 --- a/spring-cloud-modules/spring-cloud-data-flow/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/pom.xml @@ -17,8 +17,8 @@ spring-cloud-data-flow-stream-processing spring-cloud-data-flow-etl - batch-job - apache-spark-job + spring-cloud-data-flow-batch-job + spring-cloud-data-flow-apache-spark-job \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/README.md b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-apache-spark-job/README.md similarity index 100% rename from spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/README.md rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-apache-spark-job/README.md diff --git a/spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-apache-spark-job/pom.xml similarity index 90% rename from spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-apache-spark-job/pom.xml index b2b0c7d68a..b619cb43d0 100644 --- a/spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-apache-spark-job/pom.xml @@ -3,8 +3,8 @@ 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 - apache-spark-job - apache-spark-job + spring-cloud-data-flow-apache-spark-job + spring-cloud-data-flow-apache-spark-job com.baeldung.spring.cloud diff --git a/spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/src/main/java/com/baeldung/spring/cloud/PiApproximation.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-apache-spark-job/src/main/java/com/baeldung/spring/cloud/PiApproximation.java similarity index 100% rename from spring-cloud-modules/spring-cloud-data-flow/apache-spark-job/src/main/java/com/baeldung/spring/cloud/PiApproximation.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-apache-spark-job/src/main/java/com/baeldung/spring/cloud/PiApproximation.java diff --git a/spring-cloud-modules/spring-cloud-data-flow/batch-job/README.md b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/README.md similarity index 100% rename from spring-cloud-modules/spring-cloud-data-flow/batch-job/README.md rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/README.md diff --git a/spring-cloud-modules/spring-cloud-data-flow/batch-job/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/pom.xml similarity index 93% rename from spring-cloud-modules/spring-cloud-data-flow/batch-job/pom.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/pom.xml index 627724a6be..1c877da946 100644 --- a/spring-cloud-modules/spring-cloud-data-flow/batch-job/pom.xml +++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung.spring.cloud - batch-job + spring-cloud-data-flow-batch-job 0.0.1-SNAPSHOT - batch-job + spring-cloud-data-flow-batch-job jar Demo project for Spring Boot diff --git a/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/BatchJobApplication.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/src/main/java/com/baeldung/spring/cloud/BatchJobApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/BatchJobApplication.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/src/main/java/com/baeldung/spring/cloud/BatchJobApplication.java diff --git a/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/JobConfiguration.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/src/main/java/com/baeldung/spring/cloud/JobConfiguration.java similarity index 100% rename from spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/java/com/baeldung/spring/cloud/JobConfiguration.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/src/main/java/com/baeldung/spring/cloud/JobConfiguration.java diff --git a/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-data-flow/batch-job/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/spring/cloud/BatchJobApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/src/test/java/com/baeldung/spring/cloud/BatchJobApplicationIntegrationTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-data-flow/batch-job/src/test/java/com/baeldung/spring/cloud/BatchJobApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-batch-job/src/test/java/com/baeldung/spring/cloud/BatchJobApplicationIntegrationTest.java diff --git a/spring-cloud-modules/spring-cloud-hystrix/pom.xml b/spring-cloud-modules/spring-cloud-hystrix/pom.xml index 41548ba36a..804faf552f 100644 --- a/spring-cloud-modules/spring-cloud-hystrix/pom.xml +++ b/spring-cloud-modules/spring-cloud-hystrix/pom.xml @@ -15,9 +15,9 @@ - feign-rest-consumer - rest-producer - rest-consumer + spring-cloud-hystrix-feign-rest-consumer + spring-cloud-hystrix-rest-producer + spring-cloud-hystrix-rest-consumer \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/pom.xml b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/pom.xml similarity index 95% rename from spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/pom.xml rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/pom.xml index b57ef7f7d3..ec9bffea98 100644 --- a/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/pom.xml +++ b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/pom.xml @@ -3,9 +3,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - feign-rest-consumer + spring-cloud-hystrix-feign-rest-consumer 1.0.0-SNAPSHOT - feign-rest-consumer + spring-cloud-hystrix-feign-rest-consumer jar diff --git a/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java diff --git a/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java diff --git a/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java diff --git a/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/main/resources/application.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/main/resources/application.properties diff --git a/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/templates/greeting-view.html b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/main/resources/templates/greeting-view.html similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/templates/greeting-view.html rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/main/resources/templates/greeting-view.html diff --git a/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/pom.xml b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/pom.xml similarity index 95% rename from spring-cloud-modules/spring-cloud-hystrix/rest-consumer/pom.xml rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/pom.xml index 741457529c..3c9d6cdf59 100644 --- a/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/pom.xml +++ b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/pom.xml @@ -3,9 +3,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - rest-consumer + spring-cloud-hystrix-rest-consumer 1.0.0-SNAPSHOT - rest-consumer + spring-cloud-hystrix-rest-consumer jar diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/main/resources/application.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/main/resources/application.properties diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/templates/greeting-view.html b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/main/resources/templates/greeting-view.html similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/templates/greeting-view.html rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/main/resources/templates/greeting-view.html diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-producer/pom.xml b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/pom.xml similarity index 90% rename from spring-cloud-modules/spring-cloud-hystrix/rest-producer/pom.xml rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/pom.xml index 8c72b34f87..cd9b8ab0ca 100644 --- a/spring-cloud-modules/spring-cloud-hystrix/rest-producer/pom.xml +++ b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/pom.xml @@ -3,9 +3,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - rest-producer + spring-cloud-hystrix-rest-producer 1.0.0-SNAPSHOT - rest-producer + spring-cloud-hystrix-rest-producer jar diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/src/main/resources/application.properties similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/src/main/resources/application.properties diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java b/spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-hystrix/spring-cloud-hystrix-rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-netflix-sidecar/pom.xml b/spring-cloud-modules/spring-cloud-netflix-sidecar/pom.xml index 3a72496279..919be24a35 100644 --- a/spring-cloud-modules/spring-cloud-netflix-sidecar/pom.xml +++ b/spring-cloud-modules/spring-cloud-netflix-sidecar/pom.xml @@ -17,8 +17,8 @@ - sidecar-demo - echo-demo + spring-cloud-netflix-sidecar-demo + spring-cloud-netflix-sidecar-echo-demo diff --git a/spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js b/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/nodejs/hello.js similarity index 100% rename from spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js rename to spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/nodejs/hello.js diff --git a/spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml b/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/pom.xml similarity index 94% rename from spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml rename to spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/pom.xml index 200897652f..f8552aba93 100644 --- a/spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml +++ b/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - sidecar-demo - sidecar-demo + spring-cloud-netflix-sidecar-demo + spring-cloud-netflix-sidecar-demo Sidecar demo for hello endpoint diff --git a/spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java b/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java rename to spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java diff --git a/spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/src/main/resources/application.yml similarity index 100% rename from spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/src/main/resources/application.yml diff --git a/spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java b/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/pom.xml b/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-echo-demo/pom.xml similarity index 93% rename from spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/pom.xml rename to spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-echo-demo/pom.xml index d8b1654eaa..8066235679 100644 --- a/spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/pom.xml +++ b/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-echo-demo/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - echo-demo - echo-demo + spring-cloud-netflix-sidecar-echo-demo + spring-cloud-netflix-sidecar-echo-demo Demo for echo endpoint com.baeldung.cloud diff --git a/spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java b/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java rename to spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java diff --git a/spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-echo-demo/src/main/resources/application.yml similarity index 100% rename from spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-echo-demo/src/main/resources/application.yml diff --git a/spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java b/spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-netflix-sidecar/spring-cloud-netflix-sidecar-echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-zookeeper/pom.xml b/spring-cloud-modules/spring-cloud-zookeeper/pom.xml index a3567adb06..7ada9f0cc9 100644 --- a/spring-cloud-modules/spring-cloud-zookeeper/pom.xml +++ b/spring-cloud-modules/spring-cloud-zookeeper/pom.xml @@ -14,8 +14,8 @@ - Greeting - HelloWorld + spring-cloud-zookeeper-greeting + spring-cloud-zookeeper-helloworld \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-zookeeper/Greeting/pom.xml b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/pom.xml similarity index 96% rename from spring-cloud-modules/spring-cloud-zookeeper/Greeting/pom.xml rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/pom.xml index 8248884632..b6f711f72d 100644 --- a/spring-cloud-modules/spring-cloud-zookeeper/Greeting/pom.xml +++ b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/pom.xml @@ -3,8 +3,8 @@ 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 - Greeting - Greeting + spring-cloud-zookeeper-greeting + spring-cloud-zookeeper-greeting jar diff --git a/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java diff --git a/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java diff --git a/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java diff --git a/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/main/resources/application.yml similarity index 100% rename from spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/main/resources/application.yml diff --git a/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/templates/greeting-view.html b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/main/resources/templates/greeting-view.html similarity index 100% rename from spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/templates/greeting-view.html rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/main/resources/templates/greeting-view.html diff --git a/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-greeting/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/pom.xml b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-helloworld/pom.xml similarity index 95% rename from spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/pom.xml rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-helloworld/pom.xml index 57a1cc029c..e9baf2b174 100644 --- a/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/pom.xml +++ b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-helloworld/pom.xml @@ -3,8 +3,8 @@ 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 - HelloWorld - HelloWorld + spring-cloud-zookeeper-helloworld + spring-cloud-zookeeper-helloworld jar diff --git a/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-helloworld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-helloworld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java diff --git a/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-helloworld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-helloworld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java diff --git a/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-helloworld/src/main/resources/application.yml similarity index 100% rename from spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-helloworld/src/main/resources/application.yml diff --git a/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-helloworld/src/main/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-helloworld/src/main/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-helloworld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zookeeper/spring-cloud-zookeeper-helloworld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/pom.xml b/spring-cloud-modules/spring-cloud-zuul-fallback/pom.xml index 7cddec48fe..0cd13735f2 100644 --- a/spring-cloud-modules/spring-cloud-zuul-fallback/pom.xml +++ b/spring-cloud-modules/spring-cloud-zuul-fallback/pom.xml @@ -15,8 +15,8 @@ - api-gateway - weather-service + spring-cloud-zuul-fallback-api-gateway + spring-cloud-zuul-fallback-weather-service diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/pom.xml b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/pom.xml similarity index 93% rename from spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/pom.xml index 13bfabeb3b..bdc3d0c2bc 100644 --- a/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/pom.xml +++ b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/pom.xml @@ -3,8 +3,8 @@ 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 - api-gateway - api-gateway + spring-cloud-zuul-fallback-api-gateway + spring-cloud-zuul-fallback-api-gateway jar API Gateway using Zuul diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/main/resources/application.yml similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/main/resources/application.yml diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/test/resources/logback.xml similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-api-gateway/src/test/resources/logback.xml diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/pom.xml b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-weather-service/pom.xml similarity index 92% rename from spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-weather-service/pom.xml index 239be5e134..743684bcd3 100644 --- a/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/pom.xml +++ b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-weather-service/pom.xml @@ -3,8 +3,8 @@ 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 - weather-service - weather-service + spring-cloud-zuul-fallback-weather-service + spring-cloud-zuul-fallback-weather-service Weather Service for Zuul Fallback Test diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-weather-service/src/main/resources/application.yml similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-weather-service/src/main/resources/application.yml diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java diff --git a/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java similarity index 100% rename from spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/spring-cloud-zuul-fallback-weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java diff --git a/spring-security-modules/spring-security-web-angular/pom.xml b/spring-security-modules/spring-security-web-angular/pom.xml index cf23501dff..15dc4d007c 100644 --- a/spring-security-modules/spring-security-web-angular/pom.xml +++ b/spring-security-modules/spring-security-web-angular/pom.xml @@ -15,7 +15,7 @@ - server + spring-security-web-angular-server \ No newline at end of file diff --git a/spring-security-modules/spring-security-web-angular/client/anguarjs/app.js b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/anguarjs/app.js similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/anguarjs/app.js rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/anguarjs/app.js diff --git a/spring-security-modules/spring-security-web-angular/client/anguarjs/home/home.controller.js b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/anguarjs/home/home.controller.js similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/anguarjs/home/home.controller.js rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/anguarjs/home/home.controller.js diff --git a/spring-security-modules/spring-security-web-angular/client/anguarjs/home/home.view.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/anguarjs/home/home.view.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/anguarjs/home/home.view.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/anguarjs/home/home.view.html diff --git a/spring-security-modules/spring-security-web-angular/client/anguarjs/index.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/anguarjs/index.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/anguarjs/index.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/anguarjs/index.html diff --git a/spring-security-modules/spring-security-web-angular/client/anguarjs/login/login.controller.js b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/anguarjs/login/login.controller.js similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/anguarjs/login/login.controller.js rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/anguarjs/login/login.controller.js diff --git a/spring-security-modules/spring-security-web-angular/client/anguarjs/login/login.view.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/anguarjs/login/login.view.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/anguarjs/login/login.view.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/anguarjs/login/login.view.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/app.css b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app.css similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/app.css rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app.css diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/app/app.component.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/app.component.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/app/app.component.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/app.component.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/app/app.component.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/app.component.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/app/app.component.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/app.component.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/app/app.module.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/app.module.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/app/app.module.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/app.module.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/app/app.routing.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/app.routing.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/app/app.routing.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/app.routing.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/app/home/home.component.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/home/home.component.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/app/home/home.component.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/home/home.component.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/app/home/home.component.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/home/home.component.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/app/home/home.component.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/home/home.component.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/app/login/login.component.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/login/login.component.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/app/login/login.component.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/login/login.component.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/app/login/login.component.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/login/login.component.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/app/login/login.component.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/login/login.component.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/app/main.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/main.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/app/main.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/app/main.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/index.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/index.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/index.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/index.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/package.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/package.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/package.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/package.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/systemjs.config.js b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/systemjs.config.js similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/systemjs.config.js rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/systemjs.config.js diff --git a/spring-security-modules/spring-security-web-angular/client/angular2/tsconfig.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/tsconfig.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular2/tsconfig.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular2/tsconfig.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/.angular-cli.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/.angular-cli.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/.angular-cli.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/.angular-cli.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/package.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/package.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/package.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/package.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/src/app/app.component.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/app.component.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/src/app/app.component.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/app.component.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/src/app/app.component.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/app.component.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/src/app/app.component.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/app.component.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/src/app/app.module.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/app.module.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/src/app/app.module.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/app.module.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/src/app/app.routing.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/app.routing.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/src/app/app.routing.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/app.routing.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/src/app/home/home.component.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/home/home.component.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/src/app/home/home.component.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/home/home.component.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/src/app/home/home.component.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/home/home.component.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/src/app/home/home.component.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/home/home.component.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/src/app/login/login.component.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/login/login.component.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/src/app/login/login.component.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/login/login.component.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/src/app/login/login.component.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/login/login.component.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/src/app/login/login.component.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/app/login/login.component.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/src/index.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/index.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/src/index.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/index.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/src/main.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/main.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/src/main.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/main.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/src/polyfills.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/polyfills.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/src/polyfills.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/polyfills.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/src/styles.css b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/styles.css similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/src/styles.css rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/styles.css diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/src/tsconfig.app.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/tsconfig.app.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/src/tsconfig.app.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/src/tsconfig.app.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/tsconfig.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/tsconfig.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/tsconfig.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/tsconfig.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular4/tslint.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/tslint.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular4/tslint.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular4/tslint.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/.angular-cli.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/.angular-cli.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/.angular-cli.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/.angular-cli.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/package.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/package.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/package.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/package.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/src/app/app.component.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/app.component.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/src/app/app.component.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/app.component.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/src/app/app.component.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/app.component.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/src/app/app.component.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/app.component.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/src/app/app.module.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/app.module.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/src/app/app.module.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/app.module.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/src/app/app.routing.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/app.routing.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/src/app/app.routing.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/app.routing.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/src/app/home/home.component.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/home/home.component.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/src/app/home/home.component.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/home/home.component.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/src/app/home/home.component.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/home/home.component.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/src/app/home/home.component.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/home/home.component.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/src/app/login/login.component.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/login/login.component.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/src/app/login/login.component.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/login/login.component.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/src/app/login/login.component.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/login/login.component.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/src/app/login/login.component.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/app/login/login.component.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/src/index.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/index.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/src/index.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/index.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/src/main.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/main.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/src/main.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/main.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/src/polyfills.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/polyfills.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/src/polyfills.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/polyfills.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/src/styles.css b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/styles.css similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/src/styles.css rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/styles.css diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/src/tsconfig.app.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/tsconfig.app.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/src/tsconfig.app.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/src/tsconfig.app.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/tsconfig.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/tsconfig.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/tsconfig.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/tsconfig.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular5/tslint.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/tslint.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular5/tslint.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular5/tslint.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/angular.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/angular.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/angular.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/angular.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/package.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/package.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/package.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/package.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/src/app/app.component.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/app.component.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/src/app/app.component.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/app.component.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/src/app/app.component.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/app.component.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/src/app/app.component.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/app.component.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/src/app/app.module.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/app.module.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/src/app/app.module.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/app.module.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/src/app/app.routing.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/app.routing.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/src/app/app.routing.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/app.routing.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/src/app/home/home.component.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/home/home.component.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/src/app/home/home.component.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/home/home.component.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/src/app/home/home.component.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/home/home.component.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/src/app/home/home.component.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/home/home.component.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/src/app/login/login.component.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/login/login.component.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/src/app/login/login.component.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/login/login.component.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/src/app/login/login.component.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/login/login.component.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/src/app/login/login.component.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/app/login/login.component.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/src/index.html b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/index.html similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/src/index.html rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/index.html diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/src/main.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/main.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/src/main.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/main.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/src/polyfills.ts b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/polyfills.ts similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/src/polyfills.ts rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/polyfills.ts diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/src/styles.css b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/styles.css similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/src/styles.css rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/styles.css diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/src/tsconfig.app.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/tsconfig.app.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/src/tsconfig.app.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/src/tsconfig.app.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/tsconfig.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/tsconfig.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/tsconfig.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/tsconfig.json diff --git a/spring-security-modules/spring-security-web-angular/client/angular6/tslint.json b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/tslint.json similarity index 100% rename from spring-security-modules/spring-security-web-angular/client/angular6/tslint.json rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-client/angular6/tslint.json diff --git a/spring-security-modules/spring-security-web-angular/server/pom.xml b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/pom.xml similarity index 95% rename from spring-security-modules/spring-security-web-angular/server/pom.xml rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/pom.xml index a1f4a9f998..c188541bbb 100644 --- a/spring-security-modules/spring-security-web-angular/server/pom.xml +++ b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/pom.xml @@ -3,8 +3,8 @@ 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 - server - server + spring-security-web-angular-server + spring-security-web-angular-server jar Spring Security Angular diff --git a/spring-security-modules/spring-security-web-angular/server/src/main/java/com/baeldung/springbootsecurityrest/basicauth/SpringBootSecurityApplication.java b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/main/java/com/baeldung/springbootsecurityrest/basicauth/SpringBootSecurityApplication.java similarity index 100% rename from spring-security-modules/spring-security-web-angular/server/src/main/java/com/baeldung/springbootsecurityrest/basicauth/SpringBootSecurityApplication.java rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/main/java/com/baeldung/springbootsecurityrest/basicauth/SpringBootSecurityApplication.java diff --git a/spring-security-modules/spring-security-web-angular/server/src/main/java/com/baeldung/springbootsecurityrest/basicauth/config/BasicAuthConfiguration.java b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/main/java/com/baeldung/springbootsecurityrest/basicauth/config/BasicAuthConfiguration.java similarity index 100% rename from spring-security-modules/spring-security-web-angular/server/src/main/java/com/baeldung/springbootsecurityrest/basicauth/config/BasicAuthConfiguration.java rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/main/java/com/baeldung/springbootsecurityrest/basicauth/config/BasicAuthConfiguration.java diff --git a/spring-security-modules/spring-security-web-angular/server/src/main/java/com/baeldung/springbootsecurityrest/controller/UserController.java b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/main/java/com/baeldung/springbootsecurityrest/controller/UserController.java similarity index 100% rename from spring-security-modules/spring-security-web-angular/server/src/main/java/com/baeldung/springbootsecurityrest/controller/UserController.java rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/main/java/com/baeldung/springbootsecurityrest/controller/UserController.java diff --git a/spring-security-modules/spring-security-web-angular/server/src/main/java/com/baeldung/springbootsecurityrest/vo/User.java b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/main/java/com/baeldung/springbootsecurityrest/vo/User.java similarity index 100% rename from spring-security-modules/spring-security-web-angular/server/src/main/java/com/baeldung/springbootsecurityrest/vo/User.java rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/main/java/com/baeldung/springbootsecurityrest/vo/User.java diff --git a/spring-security-modules/spring-security-web-angular/server/src/main/resources/application.properties b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/main/resources/application.properties similarity index 100% rename from spring-security-modules/spring-security-web-angular/server/src/main/resources/application.properties rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/main/resources/application.properties diff --git a/spring-security-modules/spring-security-web-angular/server/src/main/resources/logback.xml b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/main/resources/logback.xml similarity index 100% rename from spring-security-modules/spring-security-web-angular/server/src/main/resources/logback.xml rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/main/resources/logback.xml diff --git a/spring-security-modules/spring-security-web-angular/server/src/test/java/com/baeldung/SpringContextTest.java b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-security-modules/spring-security-web-angular/server/src/test/java/com/baeldung/SpringContextTest.java rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-security-modules/spring-security-web-angular/server/src/test/java/com/baeldung/springbootsecurityrest/BasicAuthConfigurationIntegrationTest.java b/spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/test/java/com/baeldung/springbootsecurityrest/BasicAuthConfigurationIntegrationTest.java similarity index 100% rename from spring-security-modules/spring-security-web-angular/server/src/test/java/com/baeldung/springbootsecurityrest/BasicAuthConfigurationIntegrationTest.java rename to spring-security-modules/spring-security-web-angular/spring-security-web-angular-server/src/test/java/com/baeldung/springbootsecurityrest/BasicAuthConfigurationIntegrationTest.java diff --git a/struts/README.md b/struts/README.md new file mode 100644 index 0000000000..d15b94f662 --- /dev/null +++ b/struts/README.md @@ -0,0 +1,7 @@ +## Struts 2 + +This module contains articles about Struts 2 + +### Relevant articles + +- [A Quick Struts 2 Intro](https://www.baeldung.com/struts-2-intro) diff --git a/struts/WebContent/WEB-INF/web.xml b/struts/WebContent/WEB-INF/web.xml new file mode 100644 index 0000000000..8f1b55943c --- /dev/null +++ b/struts/WebContent/WEB-INF/web.xml @@ -0,0 +1,12 @@ + + + struts + + struts2 + org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter + + + struts2 + /* + + \ No newline at end of file diff --git a/struts/WebContent/input.jsp b/struts/WebContent/input.jsp new file mode 100644 index 0000000000..6d80aa3ffd --- /dev/null +++ b/struts/WebContent/input.jsp @@ -0,0 +1,21 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + +Baledung Struts + + +
+

Welcome to Baeldung Struts 2 app

+

Which car do you like !!

+

Please choose ferrari or bmw

+ + +
+ + \ No newline at end of file diff --git a/struts/WebContent/result.jsp b/struts/WebContent/result.jsp new file mode 100644 index 0000000000..0fe9ea2d1d --- /dev/null +++ b/struts/WebContent/result.jsp @@ -0,0 +1,11 @@ +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + + +Hello World + + +

Hello Baeldung User

+

You are a

+ + diff --git a/struts/pom.xml b/struts/pom.xml new file mode 100644 index 0000000000..a668ea29db --- /dev/null +++ b/struts/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + struts + 0.0.1-SNAPSHOT + struts + pom + + + com.baeldung + parent-spring-4 + 0.0.1-SNAPSHOT + ../parent-spring-4 + + + + + org.apache.struts + struts2-core + ${struts2.version} + + + org.apache.struts + struts2-junit-plugin + ${struts2.version} + + + org.apache.struts + struts2-convention-plugin + ${struts2-convention-plugin.version} + + + javax.servlet + javax.servlet-api + ${javax.servlet-api.version} + + + org.springframework + spring-core + ${spring.version} + + + commons-logging + commons-logging + + + + + + + src/main/java + + + src/main/resources + + + + + maven-war-plugin + ${maven-war-plugin.version} + + WebContent + + + + + + + 2.5.5 + 2.5.8 + 4.3.6.RELEASE + + + \ No newline at end of file diff --git a/struts/src/main/java/com/baeldung/struts/CarAction.java b/struts/src/main/java/com/baeldung/struts/CarAction.java new file mode 100644 index 0000000000..478f3b4cc2 --- /dev/null +++ b/struts/src/main/java/com/baeldung/struts/CarAction.java @@ -0,0 +1,37 @@ +package com.baeldung.struts; + +import org.apache.struts2.convention.annotation.Action; +import org.apache.struts2.convention.annotation.Namespace; +import org.apache.struts2.convention.annotation.Result; + +@Namespace("/tutorial") +@Action("/car") +@Result(name = "success", location = "/result.jsp") +public class CarAction { + private String carName; + private String carMessage; + private CarMessageService carMessageService = new CarMessageService(); + + public String execute() { + System.out.println("inside execute(): carName is" + carName); + this.setCarMessage(this.carMessageService.getMessage(carName)); + return "success"; + } + + public String getCarName() { + return carName; + } + + public void setCarName(String carName) { + this.carName = carName; + } + + public String getCarMessage() { + return carMessage; + } + + public void setCarMessage(String carMessage) { + this.carMessage = carMessage; + } + +} diff --git a/struts/src/main/java/com/baeldung/struts/CarMessageService.java b/struts/src/main/java/com/baeldung/struts/CarMessageService.java new file mode 100644 index 0000000000..34d3ca3d76 --- /dev/null +++ b/struts/src/main/java/com/baeldung/struts/CarMessageService.java @@ -0,0 +1,18 @@ +package com.baeldung.struts; + +public class CarMessageService { + + public String getMessage(String carName) { + System.out.println("inside getMessage()" + carName); + if (carName.equalsIgnoreCase("ferrari")){ + return "Ferrari Fan!"; + } + else if (carName.equalsIgnoreCase("bmw")){ + return "BMW Fan!"; + } + else{ + return "please choose ferrari Or bmw"; + } + } + +} diff --git a/struts/src/main/resources/logback.xml b/struts/src/main/resources/logback.xml new file mode 100644 index 0000000000..7d900d8ea8 --- /dev/null +++ b/struts/src/main/resources/logback.xml @@ -0,0 +1,13 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + \ No newline at end of file diff --git a/struts/src/test/java/com/baeldung/struts/test/CarActionTest.java b/struts/src/test/java/com/baeldung/struts/test/CarActionTest.java new file mode 100644 index 0000000000..64b640edfb --- /dev/null +++ b/struts/src/test/java/com/baeldung/struts/test/CarActionTest.java @@ -0,0 +1,29 @@ +//package com.baeldung.struts.test; +// +//import org.apache.struts2.StrutsTestCase; +//import org.junit.Test; +// +//import com.baeldung.struts.CarAction; +//import com.opensymphony.xwork2.ActionProxy; +// +//public class CarActionTest extends StrutsTestCase { +// +// public void testgivenCarOptions_WhenferrariSelected_ThenShowMessage() throws Exception { +// request.setParameter("carName", "ferrari"); +// ActionProxy proxy = getActionProxy("/tutorial/car.action"); +// CarAction carAction = (CarAction) proxy.getAction(); +// String result = proxy.execute(); +// assertEquals(result, "success"); +// assertEquals(carAction.getCarMessage(), "Ferrari Fan!"); +// } +// +// public void testgivenCarOptions_WhenbmwSelected_ThenShowMessage() throws Exception { +// request.setParameter("carName", "bmw"); +// ActionProxy proxy = getActionProxy("/tutorial/car.action"); +// CarAction carAction = (CarAction) proxy.getAction(); +// String result = proxy.execute(); +// assertEquals(result, "success"); +// assertEquals(carAction.getCarMessage(), "BMW Fan!"); +// } +// +//}