diff --git a/reactive/webflux/authentication/username-password/form/build.gradle b/reactive/webflux/java/authentication/username-password/form/build.gradle similarity index 100% rename from reactive/webflux/authentication/username-password/form/build.gradle rename to reactive/webflux/java/authentication/username-password/form/build.gradle diff --git a/reactive/webflux/authentication/username-password/form/gradle.properties b/reactive/webflux/java/authentication/username-password/form/gradle.properties similarity index 100% rename from reactive/webflux/authentication/username-password/form/gradle.properties rename to reactive/webflux/java/authentication/username-password/form/gradle.properties diff --git a/reactive/webflux/authentication/username-password/form/gradle/wrapper/gradle-wrapper.jar b/reactive/webflux/java/authentication/username-password/form/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from reactive/webflux/authentication/username-password/form/gradle/wrapper/gradle-wrapper.jar rename to reactive/webflux/java/authentication/username-password/form/gradle/wrapper/gradle-wrapper.jar diff --git a/reactive/webflux/authentication/username-password/form/gradle/wrapper/gradle-wrapper.properties b/reactive/webflux/java/authentication/username-password/form/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from reactive/webflux/authentication/username-password/form/gradle/wrapper/gradle-wrapper.properties rename to reactive/webflux/java/authentication/username-password/form/gradle/wrapper/gradle-wrapper.properties diff --git a/reactive/webflux/authentication/username-password/form/gradlew b/reactive/webflux/java/authentication/username-password/form/gradlew similarity index 100% rename from reactive/webflux/authentication/username-password/form/gradlew rename to reactive/webflux/java/authentication/username-password/form/gradlew diff --git a/reactive/webflux/authentication/username-password/form/gradlew.bat b/reactive/webflux/java/authentication/username-password/form/gradlew.bat similarity index 100% rename from reactive/webflux/authentication/username-password/form/gradlew.bat rename to reactive/webflux/java/authentication/username-password/form/gradlew.bat diff --git a/reactive/webflux/authentication/username-password/form/settings.gradle b/reactive/webflux/java/authentication/username-password/form/settings.gradle similarity index 100% rename from reactive/webflux/authentication/username-password/form/settings.gradle rename to reactive/webflux/java/authentication/username-password/form/settings.gradle diff --git a/reactive/webflux/authentication/username-password/form/src/integTest/java/example/WebfluxFormApplicationITests.java b/reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/WebfluxFormApplicationITests.java similarity index 100% rename from reactive/webflux/authentication/username-password/form/src/integTest/java/example/WebfluxFormApplicationITests.java rename to reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/WebfluxFormApplicationITests.java diff --git a/reactive/webflux/authentication/username-password/form/src/integTest/java/example/pages/IndexPage.java b/reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/pages/IndexPage.java similarity index 100% rename from reactive/webflux/authentication/username-password/form/src/integTest/java/example/pages/IndexPage.java rename to reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/pages/IndexPage.java diff --git a/reactive/webflux/authentication/username-password/form/src/integTest/java/example/pages/LoginPage.java b/reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/pages/LoginPage.java similarity index 100% rename from reactive/webflux/authentication/username-password/form/src/integTest/java/example/pages/LoginPage.java rename to reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/pages/LoginPage.java diff --git a/reactive/webflux/authentication/username-password/form/src/main/java/example/IndexController.java b/reactive/webflux/java/authentication/username-password/form/src/main/java/example/IndexController.java similarity index 100% rename from reactive/webflux/authentication/username-password/form/src/main/java/example/IndexController.java rename to reactive/webflux/java/authentication/username-password/form/src/main/java/example/IndexController.java diff --git a/reactive/webflux/authentication/username-password/form/src/main/java/example/WebfluxFormApplication.java b/reactive/webflux/java/authentication/username-password/form/src/main/java/example/WebfluxFormApplication.java similarity index 100% rename from reactive/webflux/authentication/username-password/form/src/main/java/example/WebfluxFormApplication.java rename to reactive/webflux/java/authentication/username-password/form/src/main/java/example/WebfluxFormApplication.java diff --git a/reactive/webflux/authentication/username-password/form/src/main/java/example/WebfluxFormSecurityConfiguration.java b/reactive/webflux/java/authentication/username-password/form/src/main/java/example/WebfluxFormSecurityConfiguration.java similarity index 100% rename from reactive/webflux/authentication/username-password/form/src/main/java/example/WebfluxFormSecurityConfiguration.java rename to reactive/webflux/java/authentication/username-password/form/src/main/java/example/WebfluxFormSecurityConfiguration.java diff --git a/reactive/webflux/authentication/username-password/form/src/main/resources/logback.xml b/reactive/webflux/java/authentication/username-password/form/src/main/resources/logback.xml similarity index 100% rename from reactive/webflux/authentication/username-password/form/src/main/resources/logback.xml rename to reactive/webflux/java/authentication/username-password/form/src/main/resources/logback.xml diff --git a/reactive/webflux/authentication/username-password/form/src/main/resources/templates/index.html b/reactive/webflux/java/authentication/username-password/form/src/main/resources/templates/index.html similarity index 100% rename from reactive/webflux/authentication/username-password/form/src/main/resources/templates/index.html rename to reactive/webflux/java/authentication/username-password/form/src/main/resources/templates/index.html diff --git a/reactive/webflux/authentication/username-password/form/src/main/resources/templates/login.html b/reactive/webflux/java/authentication/username-password/form/src/main/resources/templates/login.html similarity index 100% rename from reactive/webflux/authentication/username-password/form/src/main/resources/templates/login.html rename to reactive/webflux/java/authentication/username-password/form/src/main/resources/templates/login.html diff --git a/reactive/webflux/authentication/x509/build.gradle b/reactive/webflux/java/authentication/x509/build.gradle similarity index 100% rename from reactive/webflux/authentication/x509/build.gradle rename to reactive/webflux/java/authentication/x509/build.gradle diff --git a/reactive/webflux/authentication/x509/gradle.properties b/reactive/webflux/java/authentication/x509/gradle.properties similarity index 100% rename from reactive/webflux/authentication/x509/gradle.properties rename to reactive/webflux/java/authentication/x509/gradle.properties diff --git a/reactive/webflux/authentication/x509/gradle/wrapper/gradle-wrapper.jar b/reactive/webflux/java/authentication/x509/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from reactive/webflux/authentication/x509/gradle/wrapper/gradle-wrapper.jar rename to reactive/webflux/java/authentication/x509/gradle/wrapper/gradle-wrapper.jar diff --git a/reactive/webflux/authentication/x509/gradle/wrapper/gradle-wrapper.properties b/reactive/webflux/java/authentication/x509/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from reactive/webflux/authentication/x509/gradle/wrapper/gradle-wrapper.properties rename to reactive/webflux/java/authentication/x509/gradle/wrapper/gradle-wrapper.properties diff --git a/reactive/webflux/authentication/x509/gradlew b/reactive/webflux/java/authentication/x509/gradlew similarity index 100% rename from reactive/webflux/authentication/x509/gradlew rename to reactive/webflux/java/authentication/x509/gradlew diff --git a/reactive/webflux/authentication/x509/gradlew.bat b/reactive/webflux/java/authentication/x509/gradlew.bat similarity index 100% rename from reactive/webflux/authentication/x509/gradlew.bat rename to reactive/webflux/java/authentication/x509/gradlew.bat diff --git a/reactive/webflux/authentication/x509/settings.gradle b/reactive/webflux/java/authentication/x509/settings.gradle similarity index 100% rename from reactive/webflux/authentication/x509/settings.gradle rename to reactive/webflux/java/authentication/x509/settings.gradle diff --git a/reactive/webflux/authentication/x509/src/integTest/java/example/WebfluxX509ApplicationITest.java b/reactive/webflux/java/authentication/x509/src/integTest/java/example/WebfluxX509ApplicationITest.java similarity index 100% rename from reactive/webflux/authentication/x509/src/integTest/java/example/WebfluxX509ApplicationITest.java rename to reactive/webflux/java/authentication/x509/src/integTest/java/example/WebfluxX509ApplicationITest.java diff --git a/reactive/webflux/authentication/x509/src/main/java/example/MeController.java b/reactive/webflux/java/authentication/x509/src/main/java/example/MeController.java similarity index 100% rename from reactive/webflux/authentication/x509/src/main/java/example/MeController.java rename to reactive/webflux/java/authentication/x509/src/main/java/example/MeController.java diff --git a/reactive/webflux/authentication/x509/src/main/java/example/WebfluxX509Application.java b/reactive/webflux/java/authentication/x509/src/main/java/example/WebfluxX509Application.java similarity index 100% rename from reactive/webflux/authentication/x509/src/main/java/example/WebfluxX509Application.java rename to reactive/webflux/java/authentication/x509/src/main/java/example/WebfluxX509Application.java diff --git a/reactive/webflux/authentication/x509/src/main/resources/application.yml b/reactive/webflux/java/authentication/x509/src/main/resources/application.yml similarity index 100% rename from reactive/webflux/authentication/x509/src/main/resources/application.yml rename to reactive/webflux/java/authentication/x509/src/main/resources/application.yml diff --git a/reactive/webflux/authentication/x509/src/main/resources/certs/client.cer b/reactive/webflux/java/authentication/x509/src/main/resources/certs/client.cer similarity index 100% rename from reactive/webflux/authentication/x509/src/main/resources/certs/client.cer rename to reactive/webflux/java/authentication/x509/src/main/resources/certs/client.cer diff --git a/reactive/webflux/authentication/x509/src/main/resources/certs/client.keystore b/reactive/webflux/java/authentication/x509/src/main/resources/certs/client.keystore similarity index 100% rename from reactive/webflux/authentication/x509/src/main/resources/certs/client.keystore rename to reactive/webflux/java/authentication/x509/src/main/resources/certs/client.keystore diff --git a/reactive/webflux/authentication/x509/src/main/resources/certs/client.pem b/reactive/webflux/java/authentication/x509/src/main/resources/certs/client.pem similarity index 100% rename from reactive/webflux/authentication/x509/src/main/resources/certs/client.pem rename to reactive/webflux/java/authentication/x509/src/main/resources/certs/client.pem diff --git a/reactive/webflux/authentication/x509/src/main/resources/certs/curl_app.sh b/reactive/webflux/java/authentication/x509/src/main/resources/certs/curl_app.sh similarity index 100% rename from reactive/webflux/authentication/x509/src/main/resources/certs/curl_app.sh rename to reactive/webflux/java/authentication/x509/src/main/resources/certs/curl_app.sh diff --git a/reactive/webflux/authentication/x509/src/main/resources/certs/server.p12 b/reactive/webflux/java/authentication/x509/src/main/resources/certs/server.p12 similarity index 100% rename from reactive/webflux/authentication/x509/src/main/resources/certs/server.p12 rename to reactive/webflux/java/authentication/x509/src/main/resources/certs/server.p12 diff --git a/reactive/webflux/authentication/x509/src/main/resources/certs/tomcat.keystore b/reactive/webflux/java/authentication/x509/src/main/resources/certs/tomcat.keystore similarity index 100% rename from reactive/webflux/authentication/x509/src/main/resources/certs/tomcat.keystore rename to reactive/webflux/java/authentication/x509/src/main/resources/certs/tomcat.keystore diff --git a/reactive/webflux/hello-security-explicit/build.gradle b/reactive/webflux/java/hello-security-explicit/build.gradle similarity index 100% rename from reactive/webflux/hello-security-explicit/build.gradle rename to reactive/webflux/java/hello-security-explicit/build.gradle diff --git a/reactive/webflux/hello-security-explicit/gradle.properties b/reactive/webflux/java/hello-security-explicit/gradle.properties similarity index 100% rename from reactive/webflux/hello-security-explicit/gradle.properties rename to reactive/webflux/java/hello-security-explicit/gradle.properties diff --git a/reactive/webflux/hello-security-explicit/gradle/wrapper/gradle-wrapper.jar b/reactive/webflux/java/hello-security-explicit/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from reactive/webflux/hello-security-explicit/gradle/wrapper/gradle-wrapper.jar rename to reactive/webflux/java/hello-security-explicit/gradle/wrapper/gradle-wrapper.jar diff --git a/reactive/webflux/hello-security-explicit/gradle/wrapper/gradle-wrapper.properties b/reactive/webflux/java/hello-security-explicit/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from reactive/webflux/hello-security-explicit/gradle/wrapper/gradle-wrapper.properties rename to reactive/webflux/java/hello-security-explicit/gradle/wrapper/gradle-wrapper.properties diff --git a/reactive/webflux/hello-security-explicit/gradlew b/reactive/webflux/java/hello-security-explicit/gradlew similarity index 100% rename from reactive/webflux/hello-security-explicit/gradlew rename to reactive/webflux/java/hello-security-explicit/gradlew diff --git a/reactive/webflux/hello-security-explicit/gradlew.bat b/reactive/webflux/java/hello-security-explicit/gradlew.bat similarity index 100% rename from reactive/webflux/hello-security-explicit/gradlew.bat rename to reactive/webflux/java/hello-security-explicit/gradlew.bat diff --git a/reactive/webflux/hello-security-explicit/settings.gradle b/reactive/webflux/java/hello-security-explicit/settings.gradle similarity index 100% rename from reactive/webflux/hello-security-explicit/settings.gradle rename to reactive/webflux/java/hello-security-explicit/settings.gradle diff --git a/reactive/webflux/hello-security-explicit/src/integTest/java/example/HelloSecurityExplicitITests.java b/reactive/webflux/java/hello-security-explicit/src/integTest/java/example/HelloSecurityExplicitITests.java similarity index 100% rename from reactive/webflux/hello-security-explicit/src/integTest/java/example/HelloSecurityExplicitITests.java rename to reactive/webflux/java/hello-security-explicit/src/integTest/java/example/HelloSecurityExplicitITests.java diff --git a/reactive/webflux/hello-security-explicit/src/integTest/java/example/pages/HomePage.java b/reactive/webflux/java/hello-security-explicit/src/integTest/java/example/pages/HomePage.java similarity index 100% rename from reactive/webflux/hello-security-explicit/src/integTest/java/example/pages/HomePage.java rename to reactive/webflux/java/hello-security-explicit/src/integTest/java/example/pages/HomePage.java diff --git a/reactive/webflux/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java b/reactive/webflux/java/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java similarity index 100% rename from reactive/webflux/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java rename to reactive/webflux/java/hello-security-explicit/src/integTest/java/example/pages/LoginPage.java diff --git a/reactive/webflux/hello-security-explicit/src/integTest/java/example/pages/LogoutConfirmPage.java b/reactive/webflux/java/hello-security-explicit/src/integTest/java/example/pages/LogoutConfirmPage.java similarity index 100% rename from reactive/webflux/hello-security-explicit/src/integTest/java/example/pages/LogoutConfirmPage.java rename to reactive/webflux/java/hello-security-explicit/src/integTest/java/example/pages/LogoutConfirmPage.java diff --git a/reactive/webflux/hello-security-explicit/src/main/java/example/HelloSecurityExplicitApplication.java b/reactive/webflux/java/hello-security-explicit/src/main/java/example/HelloSecurityExplicitApplication.java similarity index 100% rename from reactive/webflux/hello-security-explicit/src/main/java/example/HelloSecurityExplicitApplication.java rename to reactive/webflux/java/hello-security-explicit/src/main/java/example/HelloSecurityExplicitApplication.java diff --git a/reactive/webflux/hello-security-explicit/src/main/java/example/IndexController.java b/reactive/webflux/java/hello-security-explicit/src/main/java/example/IndexController.java similarity index 100% rename from reactive/webflux/hello-security-explicit/src/main/java/example/IndexController.java rename to reactive/webflux/java/hello-security-explicit/src/main/java/example/IndexController.java diff --git a/reactive/webflux/hello-security-explicit/src/main/java/example/SecurityConfiguration.java b/reactive/webflux/java/hello-security-explicit/src/main/java/example/SecurityConfiguration.java similarity index 100% rename from reactive/webflux/hello-security-explicit/src/main/java/example/SecurityConfiguration.java rename to reactive/webflux/java/hello-security-explicit/src/main/java/example/SecurityConfiguration.java diff --git a/reactive/webflux/hello-security-explicit/src/main/resources/templates/index.html b/reactive/webflux/java/hello-security-explicit/src/main/resources/templates/index.html similarity index 100% rename from reactive/webflux/hello-security-explicit/src/main/resources/templates/index.html rename to reactive/webflux/java/hello-security-explicit/src/main/resources/templates/index.html diff --git a/reactive/webflux/hello-security-explicit/src/test/java/example/HelloSecurityTests.java b/reactive/webflux/java/hello-security-explicit/src/test/java/example/HelloSecurityTests.java similarity index 100% rename from reactive/webflux/hello-security-explicit/src/test/java/example/HelloSecurityTests.java rename to reactive/webflux/java/hello-security-explicit/src/test/java/example/HelloSecurityTests.java diff --git a/reactive/webflux/hello-security/build.gradle b/reactive/webflux/java/hello-security/build.gradle similarity index 100% rename from reactive/webflux/hello-security/build.gradle rename to reactive/webflux/java/hello-security/build.gradle diff --git a/reactive/webflux/hello-security/gradle.properties b/reactive/webflux/java/hello-security/gradle.properties similarity index 100% rename from reactive/webflux/hello-security/gradle.properties rename to reactive/webflux/java/hello-security/gradle.properties diff --git a/reactive/webflux/hello-security/gradle/wrapper/gradle-wrapper.jar b/reactive/webflux/java/hello-security/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from reactive/webflux/hello-security/gradle/wrapper/gradle-wrapper.jar rename to reactive/webflux/java/hello-security/gradle/wrapper/gradle-wrapper.jar diff --git a/reactive/webflux/hello-security/gradle/wrapper/gradle-wrapper.properties b/reactive/webflux/java/hello-security/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from reactive/webflux/hello-security/gradle/wrapper/gradle-wrapper.properties rename to reactive/webflux/java/hello-security/gradle/wrapper/gradle-wrapper.properties diff --git a/reactive/webflux/hello-security/gradlew b/reactive/webflux/java/hello-security/gradlew similarity index 100% rename from reactive/webflux/hello-security/gradlew rename to reactive/webflux/java/hello-security/gradlew diff --git a/reactive/webflux/hello-security/gradlew.bat b/reactive/webflux/java/hello-security/gradlew.bat similarity index 100% rename from reactive/webflux/hello-security/gradlew.bat rename to reactive/webflux/java/hello-security/gradlew.bat diff --git a/reactive/webflux/hello-security/settings.gradle b/reactive/webflux/java/hello-security/settings.gradle similarity index 100% rename from reactive/webflux/hello-security/settings.gradle rename to reactive/webflux/java/hello-security/settings.gradle diff --git a/reactive/webflux/hello-security/src/main/java/example/HelloSecurityApplication.java b/reactive/webflux/java/hello-security/src/main/java/example/HelloSecurityApplication.java similarity index 100% rename from reactive/webflux/hello-security/src/main/java/example/HelloSecurityApplication.java rename to reactive/webflux/java/hello-security/src/main/java/example/HelloSecurityApplication.java diff --git a/reactive/webflux/hello-security/src/main/java/example/IndexController.java b/reactive/webflux/java/hello-security/src/main/java/example/IndexController.java similarity index 100% rename from reactive/webflux/hello-security/src/main/java/example/IndexController.java rename to reactive/webflux/java/hello-security/src/main/java/example/IndexController.java diff --git a/reactive/webflux/hello-security/src/main/resources/templates/index.html b/reactive/webflux/java/hello-security/src/main/resources/templates/index.html similarity index 100% rename from reactive/webflux/hello-security/src/main/resources/templates/index.html rename to reactive/webflux/java/hello-security/src/main/resources/templates/index.html diff --git a/reactive/webflux/hello-security/src/test/java/example/HelloSecurityTests.java b/reactive/webflux/java/hello-security/src/test/java/example/HelloSecurityTests.java similarity index 100% rename from reactive/webflux/hello-security/src/test/java/example/HelloSecurityTests.java rename to reactive/webflux/java/hello-security/src/test/java/example/HelloSecurityTests.java diff --git a/reactive/webflux/hello/build.gradle b/reactive/webflux/java/hello/build.gradle similarity index 100% rename from reactive/webflux/hello/build.gradle rename to reactive/webflux/java/hello/build.gradle diff --git a/reactive/webflux/hello/gradle.properties b/reactive/webflux/java/hello/gradle.properties similarity index 100% rename from reactive/webflux/hello/gradle.properties rename to reactive/webflux/java/hello/gradle.properties diff --git a/reactive/webflux/hello/gradle/wrapper/gradle-wrapper.jar b/reactive/webflux/java/hello/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from reactive/webflux/hello/gradle/wrapper/gradle-wrapper.jar rename to reactive/webflux/java/hello/gradle/wrapper/gradle-wrapper.jar diff --git a/reactive/webflux/hello/gradle/wrapper/gradle-wrapper.properties b/reactive/webflux/java/hello/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from reactive/webflux/hello/gradle/wrapper/gradle-wrapper.properties rename to reactive/webflux/java/hello/gradle/wrapper/gradle-wrapper.properties diff --git a/reactive/webflux/hello/gradlew b/reactive/webflux/java/hello/gradlew similarity index 100% rename from reactive/webflux/hello/gradlew rename to reactive/webflux/java/hello/gradlew diff --git a/reactive/webflux/hello/gradlew.bat b/reactive/webflux/java/hello/gradlew.bat similarity index 100% rename from reactive/webflux/hello/gradlew.bat rename to reactive/webflux/java/hello/gradlew.bat diff --git a/reactive/webflux/hello/settings.gradle b/reactive/webflux/java/hello/settings.gradle similarity index 100% rename from reactive/webflux/hello/settings.gradle rename to reactive/webflux/java/hello/settings.gradle diff --git a/reactive/webflux/hello/src/main/java/example/HelloApplication.java b/reactive/webflux/java/hello/src/main/java/example/HelloApplication.java similarity index 100% rename from reactive/webflux/hello/src/main/java/example/HelloApplication.java rename to reactive/webflux/java/hello/src/main/java/example/HelloApplication.java diff --git a/reactive/webflux/hello/src/main/java/example/IndexController.java b/reactive/webflux/java/hello/src/main/java/example/IndexController.java similarity index 100% rename from reactive/webflux/hello/src/main/java/example/IndexController.java rename to reactive/webflux/java/hello/src/main/java/example/IndexController.java diff --git a/reactive/webflux/hello/src/main/resources/templates/index.html b/reactive/webflux/java/hello/src/main/resources/templates/index.html similarity index 100% rename from reactive/webflux/hello/src/main/resources/templates/index.html rename to reactive/webflux/java/hello/src/main/resources/templates/index.html diff --git a/reactive/webflux/hello/src/test/java/example/HelloTests.java b/reactive/webflux/java/hello/src/test/java/example/HelloTests.java similarity index 100% rename from reactive/webflux/hello/src/test/java/example/HelloTests.java rename to reactive/webflux/java/hello/src/test/java/example/HelloTests.java diff --git a/reactive/webflux/method/build.gradle b/reactive/webflux/java/method/build.gradle similarity index 100% rename from reactive/webflux/method/build.gradle rename to reactive/webflux/java/method/build.gradle diff --git a/reactive/webflux/method/gradle/gradle-wrapper.jar b/reactive/webflux/java/method/gradle/gradle-wrapper.jar similarity index 100% rename from reactive/webflux/method/gradle/gradle-wrapper.jar rename to reactive/webflux/java/method/gradle/gradle-wrapper.jar diff --git a/reactive/webflux/method/gradle/gradle-wrapper.properties b/reactive/webflux/java/method/gradle/gradle-wrapper.properties similarity index 100% rename from reactive/webflux/method/gradle/gradle-wrapper.properties rename to reactive/webflux/java/method/gradle/gradle-wrapper.properties diff --git a/reactive/webflux/method/gradle/wrapper/gradle-wrapper.jar b/reactive/webflux/java/method/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from reactive/webflux/method/gradle/wrapper/gradle-wrapper.jar rename to reactive/webflux/java/method/gradle/wrapper/gradle-wrapper.jar diff --git a/reactive/webflux/method/gradle/wrapper/gradle-wrapper.properties b/reactive/webflux/java/method/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from reactive/webflux/method/gradle/wrapper/gradle-wrapper.properties rename to reactive/webflux/java/method/gradle/wrapper/gradle-wrapper.properties diff --git a/reactive/webflux/method/gradlew b/reactive/webflux/java/method/gradlew similarity index 100% rename from reactive/webflux/method/gradlew rename to reactive/webflux/java/method/gradlew diff --git a/reactive/webflux/method/gradlew.bat b/reactive/webflux/java/method/gradlew.bat similarity index 100% rename from reactive/webflux/method/gradlew.bat rename to reactive/webflux/java/method/gradlew.bat diff --git a/reactive/webflux/method/src/integTest/java/example/HelloMethodApplicationITests.java b/reactive/webflux/java/method/src/integTest/java/example/HelloMethodApplicationITests.java similarity index 100% rename from reactive/webflux/method/src/integTest/java/example/HelloMethodApplicationITests.java rename to reactive/webflux/java/method/src/integTest/java/example/HelloMethodApplicationITests.java diff --git a/reactive/webflux/method/src/main/java/example/HelloMethodApplication.java b/reactive/webflux/java/method/src/main/java/example/HelloMethodApplication.java similarity index 100% rename from reactive/webflux/method/src/main/java/example/HelloMethodApplication.java rename to reactive/webflux/java/method/src/main/java/example/HelloMethodApplication.java diff --git a/reactive/webflux/method/src/main/java/example/MessageController.java b/reactive/webflux/java/method/src/main/java/example/MessageController.java similarity index 100% rename from reactive/webflux/method/src/main/java/example/MessageController.java rename to reactive/webflux/java/method/src/main/java/example/MessageController.java diff --git a/reactive/webflux/method/src/main/java/example/MessageService.java b/reactive/webflux/java/method/src/main/java/example/MessageService.java similarity index 100% rename from reactive/webflux/method/src/main/java/example/MessageService.java rename to reactive/webflux/java/method/src/main/java/example/MessageService.java diff --git a/reactive/webflux/method/src/main/java/example/SecurityConfiguration.java b/reactive/webflux/java/method/src/main/java/example/SecurityConfiguration.java similarity index 100% rename from reactive/webflux/method/src/main/java/example/SecurityConfiguration.java rename to reactive/webflux/java/method/src/main/java/example/SecurityConfiguration.java diff --git a/reactive/webflux/method/src/test/java/example/HelloMethodApplicationTests.java b/reactive/webflux/java/method/src/test/java/example/HelloMethodApplicationTests.java similarity index 100% rename from reactive/webflux/method/src/test/java/example/HelloMethodApplicationTests.java rename to reactive/webflux/java/method/src/test/java/example/HelloMethodApplicationTests.java diff --git a/reactive/webflux/method/src/test/java/example/MessageServiceTests.java b/reactive/webflux/java/method/src/test/java/example/MessageServiceTests.java similarity index 100% rename from reactive/webflux/method/src/test/java/example/MessageServiceTests.java rename to reactive/webflux/java/method/src/test/java/example/MessageServiceTests.java diff --git a/reactive/webflux/oauth2/login/README.adoc b/reactive/webflux/java/oauth2/login/README.adoc similarity index 100% rename from reactive/webflux/oauth2/login/README.adoc rename to reactive/webflux/java/oauth2/login/README.adoc diff --git a/reactive/webflux/oauth2/login/build.gradle b/reactive/webflux/java/oauth2/login/build.gradle similarity index 100% rename from reactive/webflux/oauth2/login/build.gradle rename to reactive/webflux/java/oauth2/login/build.gradle diff --git a/reactive/webflux/oauth2/login/gradle.properties b/reactive/webflux/java/oauth2/login/gradle.properties similarity index 100% rename from reactive/webflux/oauth2/login/gradle.properties rename to reactive/webflux/java/oauth2/login/gradle.properties diff --git a/reactive/webflux/oauth2/login/gradle/wrapper/gradle-wrapper.jar b/reactive/webflux/java/oauth2/login/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from reactive/webflux/oauth2/login/gradle/wrapper/gradle-wrapper.jar rename to reactive/webflux/java/oauth2/login/gradle/wrapper/gradle-wrapper.jar diff --git a/reactive/webflux/oauth2/login/gradle/wrapper/gradle-wrapper.properties b/reactive/webflux/java/oauth2/login/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from reactive/webflux/oauth2/login/gradle/wrapper/gradle-wrapper.properties rename to reactive/webflux/java/oauth2/login/gradle/wrapper/gradle-wrapper.properties diff --git a/reactive/webflux/oauth2/login/gradlew b/reactive/webflux/java/oauth2/login/gradlew similarity index 100% rename from reactive/webflux/oauth2/login/gradlew rename to reactive/webflux/java/oauth2/login/gradlew diff --git a/reactive/webflux/oauth2/login/gradlew.bat b/reactive/webflux/java/oauth2/login/gradlew.bat similarity index 100% rename from reactive/webflux/oauth2/login/gradlew.bat rename to reactive/webflux/java/oauth2/login/gradlew.bat diff --git a/reactive/webflux/oauth2/login/settings.gradle b/reactive/webflux/java/oauth2/login/settings.gradle similarity index 100% rename from reactive/webflux/oauth2/login/settings.gradle rename to reactive/webflux/java/oauth2/login/settings.gradle diff --git a/reactive/webflux/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java b/reactive/webflux/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java similarity index 100% rename from reactive/webflux/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java rename to reactive/webflux/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java diff --git a/reactive/webflux/oauth2/login/src/main/java/example/OAuth2LoginController.java b/reactive/webflux/java/oauth2/login/src/main/java/example/OAuth2LoginController.java similarity index 100% rename from reactive/webflux/oauth2/login/src/main/java/example/OAuth2LoginController.java rename to reactive/webflux/java/oauth2/login/src/main/java/example/OAuth2LoginController.java diff --git a/reactive/webflux/oauth2/login/src/main/java/example/ReactiveOAuth2LoginApplication.java b/reactive/webflux/java/oauth2/login/src/main/java/example/ReactiveOAuth2LoginApplication.java similarity index 100% rename from reactive/webflux/oauth2/login/src/main/java/example/ReactiveOAuth2LoginApplication.java rename to reactive/webflux/java/oauth2/login/src/main/java/example/ReactiveOAuth2LoginApplication.java diff --git a/reactive/webflux/oauth2/login/src/main/resources/application.yml b/reactive/webflux/java/oauth2/login/src/main/resources/application.yml similarity index 100% rename from reactive/webflux/oauth2/login/src/main/resources/application.yml rename to reactive/webflux/java/oauth2/login/src/main/resources/application.yml diff --git a/reactive/webflux/oauth2/login/src/main/resources/templates/index.html b/reactive/webflux/java/oauth2/login/src/main/resources/templates/index.html similarity index 100% rename from reactive/webflux/oauth2/login/src/main/resources/templates/index.html rename to reactive/webflux/java/oauth2/login/src/main/resources/templates/index.html diff --git a/reactive/webflux/oauth2/login/src/test/java/example/OAuth2LoginControllerTests.java b/reactive/webflux/java/oauth2/login/src/test/java/example/OAuth2LoginControllerTests.java similarity index 100% rename from reactive/webflux/oauth2/login/src/test/java/example/OAuth2LoginControllerTests.java rename to reactive/webflux/java/oauth2/login/src/test/java/example/OAuth2LoginControllerTests.java diff --git a/reactive/webflux/oauth2/resource-server/README.adoc b/reactive/webflux/java/oauth2/resource-server/README.adoc similarity index 100% rename from reactive/webflux/oauth2/resource-server/README.adoc rename to reactive/webflux/java/oauth2/resource-server/README.adoc diff --git a/reactive/webflux/oauth2/resource-server/build.gradle b/reactive/webflux/java/oauth2/resource-server/build.gradle similarity index 100% rename from reactive/webflux/oauth2/resource-server/build.gradle rename to reactive/webflux/java/oauth2/resource-server/build.gradle diff --git a/reactive/webflux/oauth2/resource-server/gradle.properties b/reactive/webflux/java/oauth2/resource-server/gradle.properties similarity index 100% rename from reactive/webflux/oauth2/resource-server/gradle.properties rename to reactive/webflux/java/oauth2/resource-server/gradle.properties diff --git a/reactive/webflux/oauth2/resource-server/gradle/wrapper/gradle-wrapper.jar b/reactive/webflux/java/oauth2/resource-server/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from reactive/webflux/oauth2/resource-server/gradle/wrapper/gradle-wrapper.jar rename to reactive/webflux/java/oauth2/resource-server/gradle/wrapper/gradle-wrapper.jar diff --git a/reactive/webflux/oauth2/resource-server/gradle/wrapper/gradle-wrapper.properties b/reactive/webflux/java/oauth2/resource-server/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from reactive/webflux/oauth2/resource-server/gradle/wrapper/gradle-wrapper.properties rename to reactive/webflux/java/oauth2/resource-server/gradle/wrapper/gradle-wrapper.properties diff --git a/reactive/webflux/oauth2/resource-server/gradlew b/reactive/webflux/java/oauth2/resource-server/gradlew similarity index 100% rename from reactive/webflux/oauth2/resource-server/gradlew rename to reactive/webflux/java/oauth2/resource-server/gradlew diff --git a/reactive/webflux/oauth2/resource-server/gradlew.bat b/reactive/webflux/java/oauth2/resource-server/gradlew.bat similarity index 100% rename from reactive/webflux/oauth2/resource-server/gradlew.bat rename to reactive/webflux/java/oauth2/resource-server/gradlew.bat diff --git a/reactive/webflux/oauth2/resource-server/settings.gradle b/reactive/webflux/java/oauth2/resource-server/settings.gradle similarity index 100% rename from reactive/webflux/oauth2/resource-server/settings.gradle rename to reactive/webflux/java/oauth2/resource-server/settings.gradle diff --git a/reactive/webflux/oauth2/resource-server/src/integTest/java/example/ServerOAuth2ResourceServerApplicationITests.java b/reactive/webflux/java/oauth2/resource-server/src/integTest/java/example/ServerOAuth2ResourceServerApplicationITests.java similarity index 100% rename from reactive/webflux/oauth2/resource-server/src/integTest/java/example/ServerOAuth2ResourceServerApplicationITests.java rename to reactive/webflux/java/oauth2/resource-server/src/integTest/java/example/ServerOAuth2ResourceServerApplicationITests.java diff --git a/reactive/webflux/oauth2/resource-server/src/main/java/example/OAuth2ResourceServerController.java b/reactive/webflux/java/oauth2/resource-server/src/main/java/example/OAuth2ResourceServerController.java similarity index 100% rename from reactive/webflux/oauth2/resource-server/src/main/java/example/OAuth2ResourceServerController.java rename to reactive/webflux/java/oauth2/resource-server/src/main/java/example/OAuth2ResourceServerController.java diff --git a/reactive/webflux/oauth2/resource-server/src/main/java/example/SecurityConfiguration.java b/reactive/webflux/java/oauth2/resource-server/src/main/java/example/SecurityConfiguration.java similarity index 100% rename from reactive/webflux/oauth2/resource-server/src/main/java/example/SecurityConfiguration.java rename to reactive/webflux/java/oauth2/resource-server/src/main/java/example/SecurityConfiguration.java diff --git a/reactive/webflux/oauth2/resource-server/src/main/java/example/ServerOAuth2ResourceServerApplication.java b/reactive/webflux/java/oauth2/resource-server/src/main/java/example/ServerOAuth2ResourceServerApplication.java similarity index 100% rename from reactive/webflux/oauth2/resource-server/src/main/java/example/ServerOAuth2ResourceServerApplication.java rename to reactive/webflux/java/oauth2/resource-server/src/main/java/example/ServerOAuth2ResourceServerApplication.java diff --git a/reactive/webflux/oauth2/resource-server/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java b/reactive/webflux/java/oauth2/resource-server/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java similarity index 100% rename from reactive/webflux/oauth2/resource-server/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java rename to reactive/webflux/java/oauth2/resource-server/src/main/java/org/springframework/boot/env/MockWebServerEnvironmentPostProcessor.java diff --git a/reactive/webflux/oauth2/resource-server/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java b/reactive/webflux/java/oauth2/resource-server/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java similarity index 100% rename from reactive/webflux/oauth2/resource-server/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java rename to reactive/webflux/java/oauth2/resource-server/src/main/java/org/springframework/boot/env/MockWebServerPropertySource.java diff --git a/reactive/webflux/oauth2/resource-server/src/main/java/org/springframework/boot/env/package-info.java b/reactive/webflux/java/oauth2/resource-server/src/main/java/org/springframework/boot/env/package-info.java similarity index 100% rename from reactive/webflux/oauth2/resource-server/src/main/java/org/springframework/boot/env/package-info.java rename to reactive/webflux/java/oauth2/resource-server/src/main/java/org/springframework/boot/env/package-info.java diff --git a/reactive/webflux/oauth2/resource-server/src/main/resources/META-INF/spring.factories b/reactive/webflux/java/oauth2/resource-server/src/main/resources/META-INF/spring.factories similarity index 100% rename from reactive/webflux/oauth2/resource-server/src/main/resources/META-INF/spring.factories rename to reactive/webflux/java/oauth2/resource-server/src/main/resources/META-INF/spring.factories diff --git a/reactive/webflux/oauth2/resource-server/src/main/resources/application.yml b/reactive/webflux/java/oauth2/resource-server/src/main/resources/application.yml similarity index 100% rename from reactive/webflux/oauth2/resource-server/src/main/resources/application.yml rename to reactive/webflux/java/oauth2/resource-server/src/main/resources/application.yml diff --git a/reactive/webflux/oauth2/resource-server/src/test/java/example/OAuth2ResourceServerControllerTests.java b/reactive/webflux/java/oauth2/resource-server/src/test/java/example/OAuth2ResourceServerControllerTests.java similarity index 100% rename from reactive/webflux/oauth2/resource-server/src/test/java/example/OAuth2ResourceServerControllerTests.java rename to reactive/webflux/java/oauth2/resource-server/src/test/java/example/OAuth2ResourceServerControllerTests.java diff --git a/reactive/webflux/oauth2/webclient/README.adoc b/reactive/webflux/java/oauth2/webclient/README.adoc similarity index 100% rename from reactive/webflux/oauth2/webclient/README.adoc rename to reactive/webflux/java/oauth2/webclient/README.adoc diff --git a/reactive/webflux/oauth2/webclient/build.gradle b/reactive/webflux/java/oauth2/webclient/build.gradle similarity index 100% rename from reactive/webflux/oauth2/webclient/build.gradle rename to reactive/webflux/java/oauth2/webclient/build.gradle diff --git a/reactive/webflux/oauth2/webclient/gradle.properties b/reactive/webflux/java/oauth2/webclient/gradle.properties similarity index 100% rename from reactive/webflux/oauth2/webclient/gradle.properties rename to reactive/webflux/java/oauth2/webclient/gradle.properties diff --git a/reactive/webflux/oauth2/webclient/gradle/wrapper/gradle-wrapper.jar b/reactive/webflux/java/oauth2/webclient/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from reactive/webflux/oauth2/webclient/gradle/wrapper/gradle-wrapper.jar rename to reactive/webflux/java/oauth2/webclient/gradle/wrapper/gradle-wrapper.jar diff --git a/reactive/webflux/oauth2/webclient/gradle/wrapper/gradle-wrapper.properties b/reactive/webflux/java/oauth2/webclient/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from reactive/webflux/oauth2/webclient/gradle/wrapper/gradle-wrapper.properties rename to reactive/webflux/java/oauth2/webclient/gradle/wrapper/gradle-wrapper.properties diff --git a/reactive/webflux/oauth2/webclient/gradlew b/reactive/webflux/java/oauth2/webclient/gradlew similarity index 100% rename from reactive/webflux/oauth2/webclient/gradlew rename to reactive/webflux/java/oauth2/webclient/gradlew diff --git a/reactive/webflux/oauth2/webclient/gradlew.bat b/reactive/webflux/java/oauth2/webclient/gradlew.bat similarity index 100% rename from reactive/webflux/oauth2/webclient/gradlew.bat rename to reactive/webflux/java/oauth2/webclient/gradlew.bat diff --git a/reactive/webflux/oauth2/webclient/settings.gradle b/reactive/webflux/java/oauth2/webclient/settings.gradle similarity index 100% rename from reactive/webflux/oauth2/webclient/settings.gradle rename to reactive/webflux/java/oauth2/webclient/settings.gradle diff --git a/reactive/webflux/oauth2/webclient/src/main/java/sample/IndexController.java b/reactive/webflux/java/oauth2/webclient/src/main/java/sample/IndexController.java similarity index 100% rename from reactive/webflux/oauth2/webclient/src/main/java/sample/IndexController.java rename to reactive/webflux/java/oauth2/webclient/src/main/java/sample/IndexController.java diff --git a/reactive/webflux/oauth2/webclient/src/main/java/sample/OAuth2WebClientController.java b/reactive/webflux/java/oauth2/webclient/src/main/java/sample/OAuth2WebClientController.java similarity index 100% rename from reactive/webflux/oauth2/webclient/src/main/java/sample/OAuth2WebClientController.java rename to reactive/webflux/java/oauth2/webclient/src/main/java/sample/OAuth2WebClientController.java diff --git a/reactive/webflux/oauth2/webclient/src/main/java/sample/OAuth2WebClientWebFluxApplication.java b/reactive/webflux/java/oauth2/webclient/src/main/java/sample/OAuth2WebClientWebFluxApplication.java similarity index 100% rename from reactive/webflux/oauth2/webclient/src/main/java/sample/OAuth2WebClientWebFluxApplication.java rename to reactive/webflux/java/oauth2/webclient/src/main/java/sample/OAuth2WebClientWebFluxApplication.java diff --git a/reactive/webflux/oauth2/webclient/src/main/java/sample/RegisteredOAuth2AuthorizedClientController.java b/reactive/webflux/java/oauth2/webclient/src/main/java/sample/RegisteredOAuth2AuthorizedClientController.java similarity index 100% rename from reactive/webflux/oauth2/webclient/src/main/java/sample/RegisteredOAuth2AuthorizedClientController.java rename to reactive/webflux/java/oauth2/webclient/src/main/java/sample/RegisteredOAuth2AuthorizedClientController.java diff --git a/reactive/webflux/oauth2/webclient/src/main/java/sample/SecurityConfiguration.java b/reactive/webflux/java/oauth2/webclient/src/main/java/sample/SecurityConfiguration.java similarity index 100% rename from reactive/webflux/oauth2/webclient/src/main/java/sample/SecurityConfiguration.java rename to reactive/webflux/java/oauth2/webclient/src/main/java/sample/SecurityConfiguration.java diff --git a/reactive/webflux/oauth2/webclient/src/main/java/sample/WebClientConfiguration.java b/reactive/webflux/java/oauth2/webclient/src/main/java/sample/WebClientConfiguration.java similarity index 100% rename from reactive/webflux/oauth2/webclient/src/main/java/sample/WebClientConfiguration.java rename to reactive/webflux/java/oauth2/webclient/src/main/java/sample/WebClientConfiguration.java diff --git a/reactive/webflux/oauth2/webclient/src/main/resources/application.yml b/reactive/webflux/java/oauth2/webclient/src/main/resources/application.yml similarity index 100% rename from reactive/webflux/oauth2/webclient/src/main/resources/application.yml rename to reactive/webflux/java/oauth2/webclient/src/main/resources/application.yml diff --git a/reactive/webflux/oauth2/webclient/src/main/resources/templates/index.html b/reactive/webflux/java/oauth2/webclient/src/main/resources/templates/index.html similarity index 100% rename from reactive/webflux/oauth2/webclient/src/main/resources/templates/index.html rename to reactive/webflux/java/oauth2/webclient/src/main/resources/templates/index.html diff --git a/reactive/webflux/oauth2/webclient/src/main/resources/templates/response.html b/reactive/webflux/java/oauth2/webclient/src/main/resources/templates/response.html similarity index 100% rename from reactive/webflux/oauth2/webclient/src/main/resources/templates/response.html rename to reactive/webflux/java/oauth2/webclient/src/main/resources/templates/response.html diff --git a/reactive/webflux/oauth2/webclient/src/test/java/sample/OAuth2WebClientControllerTests.java b/reactive/webflux/java/oauth2/webclient/src/test/java/sample/OAuth2WebClientControllerTests.java similarity index 100% rename from reactive/webflux/oauth2/webclient/src/test/java/sample/OAuth2WebClientControllerTests.java rename to reactive/webflux/java/oauth2/webclient/src/test/java/sample/OAuth2WebClientControllerTests.java diff --git a/reactive/webflux/oauth2/webclient/src/test/java/sample/OAuth2WebClientWebFluxApplicationTests.java b/reactive/webflux/java/oauth2/webclient/src/test/java/sample/OAuth2WebClientWebFluxApplicationTests.java similarity index 100% rename from reactive/webflux/oauth2/webclient/src/test/java/sample/OAuth2WebClientWebFluxApplicationTests.java rename to reactive/webflux/java/oauth2/webclient/src/test/java/sample/OAuth2WebClientWebFluxApplicationTests.java diff --git a/reactive/webflux/oauth2/webclient/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java b/reactive/webflux/java/oauth2/webclient/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java similarity index 100% rename from reactive/webflux/oauth2/webclient/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java rename to reactive/webflux/java/oauth2/webclient/src/test/java/sample/RegisteredOAuth2AuthorizedClientControllerTests.java diff --git a/settings.gradle b/settings.gradle index e5456f7..70a22f3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,15 +16,15 @@ pluginManagement { include ":reactive:webflux-fn:hello" include ":reactive:webflux-fn:hello-security" include ":reactive:rsocket:hello-security" -include ":reactive:webflux:hello" -include ":reactive:webflux:hello-security-explicit" -include ":reactive:webflux:oauth2:login" -include ":reactive:webflux:oauth2:resource-server" -include ":reactive:webflux:oauth2:webclient" -include ":reactive:webflux:method" -include ":reactive:webflux:hello-security" -include ":reactive:webflux:authentication:username-password:form" -include ":reactive:webflux:authentication:x509" +include ":reactive:webflux:java:hello" +include ":reactive:webflux:java:hello-security-explicit" +include ":reactive:webflux:java:oauth2:login" +include ":reactive:webflux:java:oauth2:resource-server" +include ":reactive:webflux:java:oauth2:webclient" +include ":reactive:webflux:java:method" +include ":reactive:webflux:java:hello-security" +include ":reactive:webflux:java:authentication:username-password:form" +include ":reactive:webflux:java:authentication:x509" include ":servlet:spring-boot:java:hello" include ":servlet:spring-boot:java:hello-security-explicit" include ":servlet:spring-boot:java:hello-security"