From 4d2b5f0aa2d64aa1e01da7892d2766d3cd7331a6 Mon Sep 17 00:00:00 2001 From: Tim Schimandle Date: Sun, 4 Sep 2016 06:10:22 +0200 Subject: [PATCH] BAEL-314 moving the project into a sub module to better organizae the article projects. --- .../application-config/discovery.properties | 0 .../application-config/gateway.properties | 0 .../application-config/resource.properties | 0 .../{ => part-1}/config/pom.xml | 2 +- .../integration/config/ConfigApplication.java | 0 .../src/main/resources/application.properties | 2 +- .../{ => part-1}/discovery/pom.xml | 2 +- .../discovery/DiscoveryApplication.java | 0 .../src/main/resources/bootstrap.properties | 0 .../{ => part-1}/gateway/pom.xml | 2 +- .../resource/GatewayApplication.java | 0 .../src/main/resources/bootstrap.properties | 0 .../spring-cloud-integration/part-1/pom.xml | 25 +++++++++++++++++++ .../{ => part-1}/resource/pom.xml | 2 +- .../resource/ResourceApplication.java | 0 .../src/main/resources/bootstrap.properties | 0 spring-cloud/spring-cloud-integration/pom.xml | 12 +-------- 17 files changed, 31 insertions(+), 16 deletions(-) rename spring-cloud/spring-cloud-integration/{ => part-1}/application-config/discovery.properties (100%) rename spring-cloud/spring-cloud-integration/{ => part-1}/application-config/gateway.properties (100%) rename spring-cloud/spring-cloud-integration/{ => part-1}/application-config/resource.properties (100%) rename spring-cloud/spring-cloud-integration/{ => part-1}/config/pom.xml (92%) rename spring-cloud/spring-cloud-integration/{ => part-1}/config/src/main/java/com/baeldung/spring/cloud/integration/config/ConfigApplication.java (100%) rename spring-cloud/spring-cloud-integration/{ => part-1}/config/src/main/resources/application.properties (78%) rename spring-cloud/spring-cloud-integration/{ => part-1}/discovery/pom.xml (93%) rename spring-cloud/spring-cloud-integration/{ => part-1}/discovery/src/main/java/com/baeldung/spring/cloud/integration/discovery/DiscoveryApplication.java (100%) rename spring-cloud/spring-cloud-integration/{ => part-1}/discovery/src/main/resources/bootstrap.properties (100%) rename spring-cloud/spring-cloud-integration/{ => part-1}/gateway/pom.xml (93%) rename spring-cloud/spring-cloud-integration/{ => part-1}/gateway/src/main/java/com/baeldung/spring/cloud/integration/resource/GatewayApplication.java (100%) rename spring-cloud/spring-cloud-integration/{ => part-1}/gateway/src/main/resources/bootstrap.properties (100%) create mode 100644 spring-cloud/spring-cloud-integration/part-1/pom.xml rename spring-cloud/spring-cloud-integration/{ => part-1}/resource/pom.xml (93%) rename spring-cloud/spring-cloud-integration/{ => part-1}/resource/src/main/java/com/baeldung/spring/cloud/integration/resource/ResourceApplication.java (100%) rename spring-cloud/spring-cloud-integration/{ => part-1}/resource/src/main/resources/bootstrap.properties (100%) diff --git a/spring-cloud/spring-cloud-integration/application-config/discovery.properties b/spring-cloud/spring-cloud-integration/part-1/application-config/discovery.properties similarity index 100% rename from spring-cloud/spring-cloud-integration/application-config/discovery.properties rename to spring-cloud/spring-cloud-integration/part-1/application-config/discovery.properties diff --git a/spring-cloud/spring-cloud-integration/application-config/gateway.properties b/spring-cloud/spring-cloud-integration/part-1/application-config/gateway.properties similarity index 100% rename from spring-cloud/spring-cloud-integration/application-config/gateway.properties rename to spring-cloud/spring-cloud-integration/part-1/application-config/gateway.properties diff --git a/spring-cloud/spring-cloud-integration/application-config/resource.properties b/spring-cloud/spring-cloud-integration/part-1/application-config/resource.properties similarity index 100% rename from spring-cloud/spring-cloud-integration/application-config/resource.properties rename to spring-cloud/spring-cloud-integration/part-1/application-config/resource.properties diff --git a/spring-cloud/spring-cloud-integration/config/pom.xml b/spring-cloud/spring-cloud-integration/part-1/config/pom.xml similarity index 92% rename from spring-cloud/spring-cloud-integration/config/pom.xml rename to spring-cloud/spring-cloud-integration/part-1/config/pom.xml index b186a1d5ca..c64b3626b1 100644 --- a/spring-cloud/spring-cloud-integration/config/pom.xml +++ b/spring-cloud/spring-cloud-integration/part-1/config/pom.xml @@ -6,7 +6,7 @@ com.baeldung.spring.cloud - spring-cloud-integration + part-1 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-integration/config/src/main/java/com/baeldung/spring/cloud/integration/config/ConfigApplication.java b/spring-cloud/spring-cloud-integration/part-1/config/src/main/java/com/baeldung/spring/cloud/integration/config/ConfigApplication.java similarity index 100% rename from spring-cloud/spring-cloud-integration/config/src/main/java/com/baeldung/spring/cloud/integration/config/ConfigApplication.java rename to spring-cloud/spring-cloud-integration/part-1/config/src/main/java/com/baeldung/spring/cloud/integration/config/ConfigApplication.java diff --git a/spring-cloud/spring-cloud-integration/config/src/main/resources/application.properties b/spring-cloud/spring-cloud-integration/part-1/config/src/main/resources/application.properties similarity index 78% rename from spring-cloud/spring-cloud-integration/config/src/main/resources/application.properties rename to spring-cloud/spring-cloud-integration/part-1/config/src/main/resources/application.properties index e3dd94c386..249ee471a6 100644 --- a/spring-cloud/spring-cloud-integration/config/src/main/resources/application.properties +++ b/spring-cloud/spring-cloud-integration/part-1/config/src/main/resources/application.properties @@ -1,7 +1,7 @@ server.port=8081 spring.application.name=config -spring.cloud.config.server.git.uri=file:///C:/src/cms-git/tutorials/spring-cloud/spring-cloud-integration/application-config +spring.cloud.config.server.git.uri=file:///C:/src/cms-git/tutorials/spring-cloud/spring-cloud-integration/part-1/application-config eureka.client.region = default eureka.client.registryFetchIntervalSeconds = 5 diff --git a/spring-cloud/spring-cloud-integration/discovery/pom.xml b/spring-cloud/spring-cloud-integration/part-1/discovery/pom.xml similarity index 93% rename from spring-cloud/spring-cloud-integration/discovery/pom.xml rename to spring-cloud/spring-cloud-integration/part-1/discovery/pom.xml index c827895547..6fe5d807f8 100644 --- a/spring-cloud/spring-cloud-integration/discovery/pom.xml +++ b/spring-cloud/spring-cloud-integration/part-1/discovery/pom.xml @@ -6,7 +6,7 @@ com.baeldung.spring.cloud - spring-cloud-integration + part-1 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-integration/discovery/src/main/java/com/baeldung/spring/cloud/integration/discovery/DiscoveryApplication.java b/spring-cloud/spring-cloud-integration/part-1/discovery/src/main/java/com/baeldung/spring/cloud/integration/discovery/DiscoveryApplication.java similarity index 100% rename from spring-cloud/spring-cloud-integration/discovery/src/main/java/com/baeldung/spring/cloud/integration/discovery/DiscoveryApplication.java rename to spring-cloud/spring-cloud-integration/part-1/discovery/src/main/java/com/baeldung/spring/cloud/integration/discovery/DiscoveryApplication.java diff --git a/spring-cloud/spring-cloud-integration/discovery/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-integration/part-1/discovery/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-integration/discovery/src/main/resources/bootstrap.properties rename to spring-cloud/spring-cloud-integration/part-1/discovery/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-integration/gateway/pom.xml b/spring-cloud/spring-cloud-integration/part-1/gateway/pom.xml similarity index 93% rename from spring-cloud/spring-cloud-integration/gateway/pom.xml rename to spring-cloud/spring-cloud-integration/part-1/gateway/pom.xml index 5e2db3a7af..40f1884004 100644 --- a/spring-cloud/spring-cloud-integration/gateway/pom.xml +++ b/spring-cloud/spring-cloud-integration/part-1/gateway/pom.xml @@ -6,7 +6,7 @@ com.baeldung.spring.cloud - spring-cloud-integration + part-1 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-integration/gateway/src/main/java/com/baeldung/spring/cloud/integration/resource/GatewayApplication.java b/spring-cloud/spring-cloud-integration/part-1/gateway/src/main/java/com/baeldung/spring/cloud/integration/resource/GatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-integration/gateway/src/main/java/com/baeldung/spring/cloud/integration/resource/GatewayApplication.java rename to spring-cloud/spring-cloud-integration/part-1/gateway/src/main/java/com/baeldung/spring/cloud/integration/resource/GatewayApplication.java diff --git a/spring-cloud/spring-cloud-integration/gateway/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-integration/part-1/gateway/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-integration/gateway/src/main/resources/bootstrap.properties rename to spring-cloud/spring-cloud-integration/part-1/gateway/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-integration/part-1/pom.xml b/spring-cloud/spring-cloud-integration/part-1/pom.xml new file mode 100644 index 0000000000..770e26bca2 --- /dev/null +++ b/spring-cloud/spring-cloud-integration/part-1/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + + com.baeldung.spring.cloud + spring-cloud-integration + 1.0.0-SNAPSHOT + + + + config + discovery + gateway + resource + + + part-1 + 1.0.0-SNAPSHOT + pom + + + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-integration/resource/pom.xml b/spring-cloud/spring-cloud-integration/part-1/resource/pom.xml similarity index 93% rename from spring-cloud/spring-cloud-integration/resource/pom.xml rename to spring-cloud/spring-cloud-integration/part-1/resource/pom.xml index 1b109022f4..f1a17918ef 100644 --- a/spring-cloud/spring-cloud-integration/resource/pom.xml +++ b/spring-cloud/spring-cloud-integration/part-1/resource/pom.xml @@ -6,7 +6,7 @@ com.baeldung.spring.cloud - spring-cloud-integration + part-1 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-integration/resource/src/main/java/com/baeldung/spring/cloud/integration/resource/ResourceApplication.java b/spring-cloud/spring-cloud-integration/part-1/resource/src/main/java/com/baeldung/spring/cloud/integration/resource/ResourceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-integration/resource/src/main/java/com/baeldung/spring/cloud/integration/resource/ResourceApplication.java rename to spring-cloud/spring-cloud-integration/part-1/resource/src/main/java/com/baeldung/spring/cloud/integration/resource/ResourceApplication.java diff --git a/spring-cloud/spring-cloud-integration/resource/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-integration/part-1/resource/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-integration/resource/src/main/resources/bootstrap.properties rename to spring-cloud/spring-cloud-integration/part-1/resource/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-integration/pom.xml b/spring-cloud/spring-cloud-integration/pom.xml index 5417e83cbf..922875df14 100644 --- a/spring-cloud/spring-cloud-integration/pom.xml +++ b/spring-cloud/spring-cloud-integration/pom.xml @@ -10,10 +10,7 @@ pom - config - discovery - gateway - resource + part-1 @@ -40,13 +37,6 @@ pom import - - org.springframework.data - spring-data-releasetrain - Hopper-SR2 - pom - import -