diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..b901097f --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..2cc7d4a5 Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..642d572c --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/ConfigData/application.yml b/ConfigData/application.yml index d1297989..75ca07b8 100644 --- a/ConfigData/application.yml +++ b/ConfigData/application.yml @@ -5,6 +5,14 @@ eureka: serviceUrl: defaultZone: http://localhost:8010/eureka/ +--- +spring: + profiles: eurekacluster +eureka: + client: + serviceUrl: + defaultZone: http://eureka-primary:8011/eureka/,http://eureka-secondary:8012/eureka/,http://eureka-tertiary:8013/eureka/ + --- spring: profiles: subject diff --git a/LabInstructions/Docker Integration.md b/LabInstructions/Docker Integration.md new file mode 100644 index 00000000..c0b622a9 --- /dev/null +++ b/LabInstructions/Docker Integration.md @@ -0,0 +1,14 @@ +## Running solutions with Docker + +1. Install Docker and docker-compose +2. Build docker image of each solution using maven spring-boot:build-image [Spring Boot with Docker](https://spring.io/guides/gs/spring-boot-docker/) + + See example on comment at top of each docker-compose.yml file. Example: + ```shell script + ./mvnw -pl lab-3/client-solution,lab-3/server-solution spring-boot:build-image + ``` +3. Run solution containers: + ```shell script + cd lab-3 + docker-compose up + ``` diff --git a/common/config-server/pom.xml b/common/config-server/pom.xml index a1ea9693..e9fb23ab 100644 --- a/common/config-server/pom.xml +++ b/common/config-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/common/docker-compose.yml b/common/docker-compose.yml new file mode 100644 index 00000000..ae9c7142 --- /dev/null +++ b/common/docker-compose.yml @@ -0,0 +1,34 @@ +version: '2.4' +# Remember to build images before up: +# ./mvnw -pl common/config-server,common/eureka-server spring-boot:build-image +services: + # EUREKA CLUSTER - 3 instances + eureka-primary: + image: 'common-eureka-server:1' + environment: + - SPRING_PROFILES_ACTIVE=primary + ports: + - '8011:8011' + eureka-secondary: + image: 'common-eureka-server:1' + environment: + - SPRING_PROFILES_ACTIVE=secondary + eureka-tertiary: + image: 'common-eureka-server:1' + environment: + - SPRING_PROFILES_ACTIVE=tertiary + # CONFIG SERVER + config-server: + image: 'common-config-server:1' + environment: + - SPRING_CLOUD_CONFIG_SERVER_GIT_URI=https://github.com/textangustus/Microservices-With-Spring-Student-Files + ports: + - '8001:8001' + healthchecker: + image: curlimages/curl:latest + entrypoint: ["tail", "-f", "/dev/null"] + healthcheck: + test: ["CMD", "curl", "-f", "http://config-server:8001/actuator/info"] + interval: 5s + timeout: 10s + retries: 3 \ No newline at end of file diff --git a/common/eureka-server/pom.xml b/common/eureka-server/pom.xml index b892c010..82eb60e7 100644 --- a/common/eureka-server/pom.xml +++ b/common/eureka-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.test - commmon-eureka-server + common-eureka-server 1 jar @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/common/eureka-server/src/main/resources/application.yml b/common/eureka-server/src/main/resources/application.yml index cdf09553..fb8daf29 100644 --- a/common/eureka-server/src/main/resources/application.yml +++ b/common/eureka-server/src/main/resources/application.yml @@ -23,30 +23,51 @@ eureka: --- spring: profiles: primary + application: + name: eureka-server-clustered server: port: 8011 eureka: + instance: + leaseRenewalIntervalInSeconds: 5 + hostname: eureka-primary client: + registerWithEureka: true + fetchRegistry: true serviceUrl: - defaultZone: http://localhost:8012/eureka/,http://localhost:8013/eureka/ + defaultZone: ${EUREKA_DEFAULT_ZONE:http://eureka-secondary:8012/eureka/,http://eureka-tertiary:8013/eureka/} --- spring: profiles: secondary + application: + name: eureka-server-clustered server: port: 8012 eureka: + instance: + leaseRenewalIntervalInSeconds: 5 + hostname: eureka-secondary client: + registerWithEureka: true + fetchRegistry: true serviceUrl: - defaultZone: http://localhost:8013/eureka/,http://localhost:8011/eureka/ + defaultZone: ${EUREKA_DEFAULT_ZONE:http://eureka-tertiary:8013/eureka/,http://eureka-primary:8011/eureka/} --- spring: profiles: tertiary + application: + name: eureka-server-clustered server: port: 8013 eureka: + instance: + leaseRenewalIntervalInSeconds: 5 + hostname: eureka-tertiary client: + registerWithEureka: true + fetchRegistry: true serviceUrl: - defaultZone: http://localhost:8011/eureka/,http://localhost:8012/eureka/ + defaultZone: ${EUREKA_DEFAULT_ZONE:http://eureka-primary:8011/eureka/,http://eureka-secondary:8012/eureka/} \ No newline at end of file diff --git a/lab-1/boot-solution/pom.xml b/lab-1/boot-solution/pom.xml index b421f161..4ff8b604 100644 --- a/lab-1/boot-solution/pom.xml +++ b/lab-1/boot-solution/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE diff --git a/lab-10/client-solution/pom.xml b/lab-10/client-solution/pom.xml index eb52ed39..17a01b25 100644 --- a/lab-10/client-solution/pom.xml +++ b/lab-10/client-solution/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-10/client-solution/src/main/java/demo/LuckyWordController.java b/lab-10/client-solution/src/main/java/demo/LuckyWordController.java index a38f00d0..94b758a8 100644 --- a/lab-10/client-solution/src/main/java/demo/LuckyWordController.java +++ b/lab-10/client-solution/src/main/java/demo/LuckyWordController.java @@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController -@ConfigurationProperties(prefix="wordConfig") +@ConfigurationProperties(prefix="word-config") public class LuckyWordController { String luckyWord; diff --git a/lab-10/client/pom.xml b/lab-10/client/pom.xml index 44a1d2cf..1599980d 100644 --- a/lab-10/client/pom.xml +++ b/lab-10/client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-10/client/src/main/java/demo/LuckyWordController.java b/lab-10/client/src/main/java/demo/LuckyWordController.java index a38f00d0..94b758a8 100644 --- a/lab-10/client/src/main/java/demo/LuckyWordController.java +++ b/lab-10/client/src/main/java/demo/LuckyWordController.java @@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController -@ConfigurationProperties(prefix="wordConfig") +@ConfigurationProperties(prefix="word-config") public class LuckyWordController { String luckyWord; diff --git a/lab-10/config-server-solution/pom.xml b/lab-10/config-server-solution/pom.xml index ed83f85c..44674fe2 100644 --- a/lab-10/config-server-solution/pom.xml +++ b/lab-10/config-server-solution/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-10/config-server-solution/src/main/java/demo/WebSecurityConfiguration.java b/lab-10/config-server-solution/src/main/java/demo/WebSecurityConfiguration.java new file mode 100644 index 00000000..87cc9322 --- /dev/null +++ b/lab-10/config-server-solution/src/main/java/demo/WebSecurityConfiguration.java @@ -0,0 +1,24 @@ +package demo; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; + +/** + * Added to disable CSFR and be able to call /encrypt /decrypt endpoints of docker instance from host. + */ +@Configuration +@EnableWebSecurity +public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter { + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.csrf().disable().authorizeRequests() + .anyRequest().authenticated().and() + .httpBasic(); + ; + } + + +} \ No newline at end of file diff --git a/lab-10/config-server/pom.xml b/lab-10/config-server/pom.xml index cdf8c0ff..0b3b535f 100644 --- a/lab-10/config-server/pom.xml +++ b/lab-10/config-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-10/docker-compose.yml b/lab-10/docker-compose.yml new file mode 100644 index 00000000..0f1453ef --- /dev/null +++ b/lab-10/docker-compose.yml @@ -0,0 +1,31 @@ +version: '2.4' +# Remember to build images before up: +# ./mvnw -pl lab-10/config-server-solution,lab-10/client-solution spring-boot:build-image +services: + # CONFIG SERVER + config-server: + image: 'lab-10-config-server-solution:1' + environment: + - SPRING_CLOUD_CONFIG_SERVER_GIT_URI=https://github.com/textangustus/Microservices-With-Spring-Student-Files + - SPRING_SECURITY_USER_NAME=myuser + - SPRING_SECURITY_USER_PASSWORD={cipher}7658ece969ac71bd6295b7cd74ca3d4839e87d5499811969e76ff21a3f8cc7e4 + ports: + - '8001:8001' + healthchecker: + image: curlimages/curl:latest + entrypoint: ["tail", "-f", "/dev/null"] + healthcheck: + test: ["CMD", "curl", "-f", "-u", "myuser:mysecret", "http://config-server:8001/actuator/info"] + interval: 5s + timeout: 10s + retries: 3 + # CLIENT SERVER + lab-10-client-server: + image: 'lab-10-client-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://myuser:mysecret@config-server:8001 + ports: + - '8002:8002' \ No newline at end of file diff --git a/lab-3/client-solution/pom.xml b/lab-3/client-solution/pom.xml index cf6cfb41..834e1a1f 100644 --- a/lab-3/client-solution/pom.xml +++ b/lab-3/client-solution/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-3/docker-compose.yml b/lab-3/docker-compose.yml new file mode 100644 index 00000000..43209eae --- /dev/null +++ b/lab-3/docker-compose.yml @@ -0,0 +1,29 @@ +version: '2.4' +# Remember to build images before up: +# ./mvnw -pl lab-3/client-solution,lab-3/server-solution spring-boot:build-image +services: + lab3-client: + image: 'lab-3-client-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://lab3-server:8001 + ports: + - '8002:8002' + lab3-server: + image: 'lab-3-server-solution:1' + environment: + # You could override repo URL with personal fork of the repo + - SPRING_CLOUD_CONFIG_SERVER_GIT_URI=https://github.com/textangustus/Microservices-With-Spring-Student-Files + healthchecker: + image: curlimages/curl:latest + entrypoint: ["tail", "-f", "/dev/null"] + depends_on: + - lab3-server + healthcheck: + test: ["CMD", "curl", "-f", "http://lab3-server:8001/actuator/info"] + interval: 5s + timeout: 10s + retries: 3 + diff --git a/lab-3/server-solution/pom.xml b/lab-3/server-solution/pom.xml index 64ce97ba..9f154cad 100644 --- a/lab-3/server-solution/pom.xml +++ b/lab-3/server-solution/pom.xml @@ -5,7 +5,7 @@ org.test lab-3-server-solution - 0.0.1-SNAPSHOT + 1 jar lab-3-server-solution @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-4/docker-compose.yml b/lab-4/docker-compose.yml new file mode 100644 index 00000000..7875a3ea --- /dev/null +++ b/lab-4/docker-compose.yml @@ -0,0 +1,74 @@ +version: '2.4' +# Remember to build images before up: +# ./mvnw -pl lab-4/eureka-client-solution/,lab-4/eureka-server-solution spring-boot:build-image +services: + lab4-client-sentence: + image: 'lab-4-eureka-client-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_PROFILES_ACTIVE=sentence,eurekacluster + ports: + - '8020:8020' + lab4-client-subject: + image: 'lab-4-eureka-client-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_PROFILES_ACTIVE=subject,eurekacluster + lab4-client-verb: + image: 'lab-4-eureka-client-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_PROFILES_ACTIVE=verb,eurekacluster + lab4-client-article: + image: 'lab-4-eureka-client-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_PROFILES_ACTIVE=article,eurekacluster + lab4-client-adjective: + image: 'lab-4-eureka-client-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_PROFILES_ACTIVE=adjective,eurekacluster + lab4-client-noun: + image: 'lab-4-eureka-client-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_PROFILES_ACTIVE=noun,eurekacluster + # Eureka Cluster - 3 instances + eureka-primary: + image: 'lab-4-eureka-server-solution:1' + environment: + - SPRING_PROFILES_ACTIVE=primary + ports: + - '8011:8011' + eureka-secondary: + image: 'lab-4-eureka-server-solution:1' + environment: + - SPRING_PROFILES_ACTIVE=secondary + eureka-tertiary: + image: 'lab-4-eureka-server-solution:1' + environment: + - SPRING_PROFILES_ACTIVE=tertiary + healthchecker: + image: curlimages/curl:latest + entrypoint: ["tail", "-f", "/dev/null"] + depends_on: + - eureka-primary + healthcheck: + test: ["CMD", "curl", "-f", "http://eureka-primary:8011/actuator/info"] + interval: 5s + timeout: 10s + retries: 3 + diff --git a/lab-4/eureka-client-solution/pom.xml b/lab-4/eureka-client-solution/pom.xml index 78c7cb6d..17f4c22f 100644 --- a/lab-4/eureka-client-solution/pom.xml +++ b/lab-4/eureka-client-solution/pom.xml @@ -5,16 +5,16 @@ org.test lab-4-eureka-client-solution - 0.0.1-SNAPSHOT + 1 jar - 01-boot-demo + lab-4-eureka-client-solution Demo project for Spring Boot org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-4/eureka-client-solution/src/main/resources/application.yml b/lab-4/eureka-client-solution/src/main/resources/application.yml index da735604..12ed6f23 100644 --- a/lab-4/eureka-client-solution/src/main/resources/application.yml +++ b/lab-4/eureka-client-solution/src/main/resources/application.yml @@ -18,6 +18,15 @@ eureka: server: port: ${PORT:${SERVER_PORT:0}} # Select any available port if neither port nor server port are specified. +--- +spring: + profiles: eurekacluster +eureka: + client: + serviceUrl: + defaultZone: http://eureka-primary:8011/eureka/,http://eureka-secondary:8012/eureka/,http://eureka-tertiary:8013/eureka/ + + --- spring: profiles: sentence diff --git a/lab-4/eureka-server-solution/pom.xml b/lab-4/eureka-server-solution/pom.xml index 9ff7530a..f08c9847 100644 --- a/lab-4/eureka-server-solution/pom.xml +++ b/lab-4/eureka-server-solution/pom.xml @@ -8,14 +8,14 @@ 1 jar - eureka-server-solution + lab-4-eureka-server-solution Demo project illustrating a Eureka server org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -32,7 +32,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-4/eureka-server-solution/src/main/resources/application.yml b/lab-4/eureka-server-solution/src/main/resources/application.yml index cda49e22..7ca4ad6c 100644 --- a/lab-4/eureka-server-solution/src/main/resources/application.yml +++ b/lab-4/eureka-server-solution/src/main/resources/application.yml @@ -29,12 +29,13 @@ server: port: 8011 eureka: instance: + leaseRenewalIntervalInSeconds: 5 hostname: eureka-primary client: registerWithEureka: true fetchRegistry: true serviceUrl: - defaultZone: http://eureka-secondary:8012/eureka/,http://eureka-tertiary:8013/eureka/ + defaultZone: ${EUREKA_DEFAULT_ZONE:http://eureka-secondary:8012/eureka/,http://eureka-tertiary:8013/eureka/} --- spring: @@ -45,12 +46,13 @@ server: port: 8012 eureka: instance: + leaseRenewalIntervalInSeconds: 5 hostname: eureka-secondary client: registerWithEureka: true fetchRegistry: true serviceUrl: - defaultZone: http://eureka-tertiary:8013/eureka/,http://eureka-primary:8011/eureka/ + defaultZone: ${EUREKA_DEFAULT_ZONE:http://eureka-primary:8011/eureka/,http://eureka-tertiary:8013/eureka/} --- spring: @@ -61,9 +63,10 @@ server: port: 8013 eureka: instance: + leaseRenewalIntervalInSeconds: 5 hostname: eureka-tertiary client: registerWithEureka: true fetchRegistry: true serviceUrl: - defaultZone: http://eureka-primary:8011/eureka/,http://eureka-secondary:8012/eureka/ \ No newline at end of file + defaultZone: ${EUREKA_DEFAULT_ZONE:http://eureka-secondary:8012/eureka/,http://eureka-primary:8011/eureka/} \ No newline at end of file diff --git a/lab-5/docker-compose.yml b/lab-5/docker-compose.yml new file mode 100644 index 00000000..ddffc9ee --- /dev/null +++ b/lab-5/docker-compose.yml @@ -0,0 +1,88 @@ +version: '2.4' +# Remember to build images before up: +# ./mvnw -pl common/config-server,common/eureka-server,lab-5/sentence-server-solution,lab-5/word-server-solution spring-boot:build-image +services: + # EUREKA CLUSTER - 3 instances + eureka-primary: + extends: + file: ../common/docker-compose.yml + service: eureka-primary + eureka-secondary: + extends: + file: ../common/docker-compose.yml + service: eureka-secondary + eureka-tertiary: + extends: + file: ../common/docker-compose.yml + service: eureka-tertiary + # CONFIG SERVER + config-server: + extends: + file: ../common/docker-compose.yml + service: config-server + healthchecker: + extends: + file: ../common/docker-compose.yml + service: healthchecker + depends_on: + - config-server + # SENTENCE INSTANCE + lab-5-sentence-server: + image: 'lab-5-sentence-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=eurekacluster + ports: + - '8020:8020' + # WORD INSTANCES + word-server-subject: + image: 'lab-5-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=subject,eurekacluster + word-server-verb: + image: 'lab-5-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=verb,eurekacluster + word-server-article: + image: 'lab-5-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=article,eurekacluster + word-server-adjective: + image: 'lab-5-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=adjective,eurekacluster + word-server-noun: + image: 'lab-5-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=noun,eurekacluster + word-server-cold-noun: + image: 'lab-5-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=cold-noun,eurekacluster diff --git a/lab-5/sentence-server-solution/pom.xml b/lab-5/sentence-server-solution/pom.xml index e6a66c8f..dbf6571d 100644 --- a/lab-5/sentence-server-solution/pom.xml +++ b/lab-5/sentence-server-solution/pom.xml @@ -8,13 +8,13 @@ 1 jar - lab-5-sentence-server + lab-5-sentence-server-solution Example microservice which assembles a sentence from words served by other services. org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-5/sentence-server/pom.xml b/lab-5/sentence-server/pom.xml index af3a1d11..4a8c8b52 100644 --- a/lab-5/sentence-server/pom.xml +++ b/lab-5/sentence-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-5/word-server-solution/pom.xml b/lab-5/word-server-solution/pom.xml index d32804cd..a1cbf6c2 100644 --- a/lab-5/word-server-solution/pom.xml +++ b/lab-5/word-server-solution/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-6/docker-compose.yml b/lab-6/docker-compose.yml new file mode 100644 index 00000000..4ad138e4 --- /dev/null +++ b/lab-6/docker-compose.yml @@ -0,0 +1,88 @@ +version: '2.4' +# Remember to build images before up: +# ./mvnw -pl common/config-server,common/eureka-server,lab-6/sentence-server-solution,lab-6/word-server spring-boot:build-image +services: + # EUREKA CLUSTER - 3 instances + eureka-primary: + extends: + file: ../common/docker-compose.yml + service: eureka-primary + eureka-secondary: + extends: + file: ../common/docker-compose.yml + service: eureka-secondary + eureka-tertiary: + extends: + file: ../common/docker-compose.yml + service: eureka-tertiary + # CONFIG SERVER + config-server: + extends: + file: ../common/docker-compose.yml + service: config-server + healthchecker: + extends: + file: ../common/docker-compose.yml + service: healthchecker + depends_on: + - config-server + # SENTENCE INSTANCE + lab-6-sentence-server: + image: 'lab-6-sentence-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=eurekacluster + ports: + - '8020:8020' + # WORD INSTANCES + word-server-subject: + image: 'lab-6-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=subject,eurekacluster + word-server-verb: + image: 'lab-6-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=verb,eurekacluster + word-server-article: + image: 'lab-6-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=article,eurekacluster + word-server-adjective: + image: 'lab-6-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=adjective,eurekacluster + word-server-noun: + image: 'lab-6-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=noun,eurekacluster + word-server-cold-noun: + image: 'lab-6-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=cold-noun,eurekacluster diff --git a/lab-6/sentence-server-solution/pom.xml b/lab-6/sentence-server-solution/pom.xml index 8e3e438c..f97e0e11 100644 --- a/lab-6/sentence-server-solution/pom.xml +++ b/lab-6/sentence-server-solution/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-6/sentence-server/pom.xml b/lab-6/sentence-server/pom.xml index c8f883cd..f1a508e7 100644 --- a/lab-6/sentence-server/pom.xml +++ b/lab-6/sentence-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-6/word-server/pom.xml b/lab-6/word-server/pom.xml index 116d71e7..f6b5a09c 100644 --- a/lab-6/word-server/pom.xml +++ b/lab-6/word-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-6/word-server/src/main/resources/application.yml b/lab-6/word-server/src/main/resources/application.yml index e7ceac67..9130788a 100644 --- a/lab-6/word-server/src/main/resources/application.yml +++ b/lab-6/word-server/src/main/resources/application.yml @@ -1,3 +1,8 @@ # Note: all properties defined in this file are subject to replacement by the configuration server. --- -words: fallback \ No newline at end of file +words: fallback + +--- +spring: + profiles: cold-noun +words: icicle,refrigerator,blizzard,snowball \ No newline at end of file diff --git a/lab-6/word-server/src/main/resources/bootstrap.yml b/lab-6/word-server/src/main/resources/bootstrap.yml index e9e0f0c1..612815e0 100644 --- a/lab-6/word-server/src/main/resources/bootstrap.yml +++ b/lab-6/word-server/src/main/resources/bootstrap.yml @@ -10,9 +10,7 @@ server: # Allow Eureka to recognize two apps of the same type on the same host as separate instances: eureka: instance: - metadataMap: - instanceId: ${spring.application.name}:${spring.application.instance_id:${random.value}} - + instanceId: ${spring.cloud.client.hostname}:${spring.application.name}:${spring.application.instance_id:${random.value}} # Depending on which profile is active, the application gives # itself a different name when registering with Eureka @@ -45,7 +43,13 @@ spring: profiles: noun application: name: noun - + +--- +spring: + profiles: cold-noun + application: + name: noun + # This profile is used when running JUnit tests locally. A spring.application.name must be provided. --- spring: diff --git a/lab-7/docker-compose.yml b/lab-7/docker-compose.yml new file mode 100644 index 00000000..5518630c --- /dev/null +++ b/lab-7/docker-compose.yml @@ -0,0 +1,109 @@ +version: '2.4' +# Remember to build images before up: +# ./mvnw -pl common/config-server,common/eureka-server,lab-7/sentence-server-solution,lab-7/sentence-server-solution-reactive,lab-7/turbine-solution,lab-7/word-server spring-boot:build-image +services: + # EUREKA CLUSTER - 3 instances + eureka-primary: + extends: + file: ../common/docker-compose.yml + service: eureka-primary + eureka-secondary: + extends: + file: ../common/docker-compose.yml + service: eureka-secondary + eureka-tertiary: + extends: + file: ../common/docker-compose.yml + service: eureka-tertiary + # CONFIG SERVER + config-server: + extends: + file: ../common/docker-compose.yml + service: config-server + healthchecker: + extends: + file: ../common/docker-compose.yml + service: healthchecker + depends_on: + - config-server + # WORD INSTANCES + word-server-subject: + image: 'lab-7-word-server:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=subject,eurekacluster + word-server-verb: + image: 'lab-7-word-server:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=verb,eurekacluster + word-server-article: + image: 'lab-7-word-server:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=article,eurekacluster + word-server-adjective: + image: 'lab-7-word-server:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=adjective,eurekacluster + word-server-noun: + image: 'lab-7-word-server:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=noun,eurekacluster + word-server-cold-noun: + image: 'lab-7-word-server:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=cold-noun,eurekacluster + # SENTENCE INSTANCES + lab-7-sentence-server: + image: 'lab-7-sentence-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=eurekacluster + ports: + - '8020:8020' + lab-7-sentence-server-reactive: + image: 'lab-7-sentence-server-solution-reactive:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=eurekacluster + ports: + - '8021:8021' + # TURBINE HYSTRIX MONITOR + lab-7-turbine-solution: + image: 'lab-7-turbine-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=eurekacluster + ports: + - '8030:8030' diff --git a/lab-7/sentence-server-solution-reactive/pom.xml b/lab-7/sentence-server-solution-reactive/pom.xml index c3911563..55fb9874 100644 --- a/lab-7/sentence-server-solution-reactive/pom.xml +++ b/lab-7/sentence-server-solution-reactive/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import @@ -93,16 +93,6 @@ spring-boot-starter-test test - - org.apache.ant - ant - 1.9.3 - - - net.wimpi - telnetd-x - 2.1.1 - diff --git a/lab-7/sentence-server-solution/pom.xml b/lab-7/sentence-server-solution/pom.xml index 15afed3a..0b1c830d 100644 --- a/lab-7/sentence-server-solution/pom.xml +++ b/lab-7/sentence-server-solution/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-7/sentence-server/pom.xml b/lab-7/sentence-server/pom.xml index 9bc8620a..635a1ee8 100644 --- a/lab-7/sentence-server/pom.xml +++ b/lab-7/sentence-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-7/turbine-solution/pom.xml b/lab-7/turbine-solution/pom.xml index 75055fd8..a3e80717 100644 --- a/lab-7/turbine-solution/pom.xml +++ b/lab-7/turbine-solution/pom.xml @@ -5,7 +5,7 @@ org.test lab-7-turbine-solution - 0.0.1-SNAPSHOT + 1 jar lab-7-turbine-solution @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-7/word-server/pom.xml b/lab-7/word-server/pom.xml index 252b5a0d..ec608dcb 100644 --- a/lab-7/word-server/pom.xml +++ b/lab-7/word-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-7/word-server/src/main/resources/application.yml b/lab-7/word-server/src/main/resources/application.yml index e7ceac67..9130788a 100644 --- a/lab-7/word-server/src/main/resources/application.yml +++ b/lab-7/word-server/src/main/resources/application.yml @@ -1,3 +1,8 @@ # Note: all properties defined in this file are subject to replacement by the configuration server. --- -words: fallback \ No newline at end of file +words: fallback + +--- +spring: + profiles: cold-noun +words: icicle,refrigerator,blizzard,snowball \ No newline at end of file diff --git a/lab-7/word-server/src/main/resources/bootstrap.yml b/lab-7/word-server/src/main/resources/bootstrap.yml index 84c7f6e7..41a66147 100644 --- a/lab-7/word-server/src/main/resources/bootstrap.yml +++ b/lab-7/word-server/src/main/resources/bootstrap.yml @@ -10,8 +10,7 @@ server: # Allow Eureka to recognize two apps of the same type on the same host as separate instances: eureka: instance: - metadataMap: - instanceId: ${spring.application.name}:${spring.application.instance_id:${random.value}} + instanceId: ${spring.cloud.client.hostname}:${spring.application.name}:${spring.application.instance_id:${random.value}} # Depending on which profile is active, the application gives # itself a different name when registering with Eureka @@ -44,7 +43,13 @@ spring: profiles: noun application: name: noun - + +--- +spring: + profiles: cold-noun + application: + name: noun + # This profile is used when running JUnit tests locally. A spring.application.name must be provided. --- spring: diff --git a/lab-8/client-solution/pom.xml b/lab-8/client-solution/pom.xml index dff913fa..72771342 100644 --- a/lab-8/client-solution/pom.xml +++ b/lab-8/client-solution/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-8/client/pom.xml b/lab-8/client/pom.xml index c93b6955..c345e648 100644 --- a/lab-8/client/pom.xml +++ b/lab-8/client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-8/config-server-solution/pom.xml b/lab-8/config-server-solution/pom.xml index 8c4ac775..d1661f46 100644 --- a/lab-8/config-server-solution/pom.xml +++ b/lab-8/config-server-solution/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-8/config-server/pom.xml b/lab-8/config-server/pom.xml index 66e4c3eb..b9a5426d 100644 --- a/lab-8/config-server/pom.xml +++ b/lab-8/config-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-8/docker-compose.yml b/lab-8/docker-compose.yml new file mode 100644 index 00000000..1a0261fa --- /dev/null +++ b/lab-8/docker-compose.yml @@ -0,0 +1,39 @@ +version: '2.4' +# Remember to build images before up: +# ./mvnw -pl lab-8/client-solution,lab-8/config-server-solution spring-boot:build-image +services: + # CONFIG SERVER + config-server: + image: 'lab-8-config-server-solution:1' + environment: + - SPRING_CLOUD_CONFIG_SERVER_GIT_URI=https://github.com/textangustus/Microservices-With-Spring-Student-Files + - SPRING_RABBITMQ_HOST=rabbitmq + - SPRING_RABBITMQ_USERNAME=user + - SPRING_RABBITMQ_PASSWORD=bitnami + depends_on: + - rabbitmq + ports: + - '8001:8001' + healthchecker: + extends: + file: ../common/docker-compose.yml + service: healthchecker + depends_on: + - config-server + # CLIENT SERVER + lab-8-client-server: + image: 'lab-8-client-solution:1' + depends_on: + healthchecker: + condition: service_healthy + rabbitmq: + condition: service_started + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_RABBITMQ_HOST=rabbitmq + - SPRING_RABBITMQ_USERNAME=user + - SPRING_RABBITMQ_PASSWORD=bitnami + ports: + - '8002:8002' + rabbitmq: + image: 'docker.io/bitnami/rabbitmq:3.8-debian-10' \ No newline at end of file diff --git a/lab-9/docker-compose.yml b/lab-9/docker-compose.yml new file mode 100644 index 00000000..10d44022 --- /dev/null +++ b/lab-9/docker-compose.yml @@ -0,0 +1,88 @@ +version: '2.4' +# Remember to build images before up: +# ./mvnw -pl lab-9/word-server,lab-9/gateway-solution spring-boot:build-image +services: + # EUREKA CLUSTER - 3 instances + eureka-primary: + extends: + file: ../common/docker-compose.yml + service: eureka-primary + eureka-secondary: + extends: + file: ../common/docker-compose.yml + service: eureka-secondary + eureka-tertiary: + extends: + file: ../common/docker-compose.yml + service: eureka-tertiary + # CONFIG SERVER + config-server: + extends: + file: ../common/docker-compose.yml + service: config-server + healthchecker: + extends: + file: ../common/docker-compose.yml + service: healthchecker + depends_on: + - config-server + # GATEWAY + gateway-api: + image: 'lab-9-gateway-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=eurekacluster + ports: + - '8080:8080' + # WORD INSTANCES + word-server-subject: + image: 'lab-9-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=subject,eurekacluster + word-server-verb: + image: 'lab-9-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=verb,eurekacluster + word-server-article: + image: 'lab-9-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=article,eurekacluster + word-server-adjective: + image: 'lab-9-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=adjective,eurekacluster + word-server-noun: + image: 'lab-9-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=noun,eurekacluster + word-server-cold-noun: + image: 'lab-9-word-server-solution:1' + depends_on: + healthchecker: + condition: service_healthy + environment: + - SPRING_CLOUD_CONFIG_URI=http://config-server:8001 + - SPRING_PROFILES_ACTIVE=cold-noun,eurekacluster \ No newline at end of file diff --git a/lab-9/gateway-solution/pom.xml b/lab-9/gateway-solution/pom.xml index 4ac25e03..64f8b182 100644 --- a/lab-9/gateway-solution/pom.xml +++ b/lab-9/gateway-solution/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-9/gateway/pom.xml b/lab-9/gateway/pom.xml index 9c05fe8e..8ade6534 100644 --- a/lab-9/gateway/pom.xml +++ b/lab-9/gateway/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-9/word-server/pom.xml b/lab-9/word-server/pom.xml index 4c89b909..f727bf46 100644 --- a/lab-9/word-server/pom.xml +++ b/lab-9/word-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.3.1.RELEASE @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-dependencies - Finchley.RELEASE + Hoxton.SR4 pom import diff --git a/lab-9/word-server/src/main/resources/application.yml b/lab-9/word-server/src/main/resources/application.yml index e7ceac67..9130788a 100644 --- a/lab-9/word-server/src/main/resources/application.yml +++ b/lab-9/word-server/src/main/resources/application.yml @@ -1,3 +1,8 @@ # Note: all properties defined in this file are subject to replacement by the configuration server. --- -words: fallback \ No newline at end of file +words: fallback + +--- +spring: + profiles: cold-noun +words: icicle,refrigerator,blizzard,snowball \ No newline at end of file diff --git a/lab-9/word-server/src/main/resources/bootstrap.yml b/lab-9/word-server/src/main/resources/bootstrap.yml index c371821c..41a66147 100644 --- a/lab-9/word-server/src/main/resources/bootstrap.yml +++ b/lab-9/word-server/src/main/resources/bootstrap.yml @@ -10,8 +10,7 @@ server: # Allow Eureka to recognize two apps of the same type on the same host as separate instances: eureka: instance: - metadataMap: - instanceId: ${spring.application.name}:${spring.application.instance_id:${random.value}} + instanceId: ${spring.cloud.client.hostname}:${spring.application.name}:${spring.application.instance_id:${random.value}} # Depending on which profile is active, the application gives # itself a different name when registering with Eureka @@ -45,6 +44,12 @@ spring: application: name: noun +--- +spring: + profiles: cold-noun + application: + name: noun + # This profile is used when running JUnit tests locally. A spring.application.name must be provided. --- spring: diff --git a/mvnw b/mvnw new file mode 100755 index 00000000..41c0f0c2 --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 00000000..86115719 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index 34f2d0da..f8367bda 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,7 @@ lab-5/sentence-server lab-5/sentence-server-solution lab-5/word-server + lab-5/word-server-solution lab-6/sentence-server lab-6/sentence-server-solution @@ -46,6 +47,11 @@ lab-9/gateway-solution lab-9/word-server + lab-10/client + lab-10/client-solution + lab-10/config-server + lab-10/config-server-solution +