Skip to content

Commit 5467a65

Browse files
mohamed-tamanmohamed-taman
committed
Merge branch 'release/4.1'
2 parents caee7a2 + 2441314 commit 5467a65

File tree

94 files changed

+45
-45
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+45
-45
lines changed

‎docker-compose-kafka.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
## Start - Product service definition
55
### Instance 1
66
product:
7-
build: product-service
7+
build: store-services/product-service
88
environment:
99
- SPRING_PROFILES_ACTIVE=docker
1010
- MANAGEMENT_HEALTH_RABBIT_ENABLED=false
@@ -17,7 +17,7 @@ services:
1717
- kafka
1818
### Instance 2
1919
product-i1:
20-
build: product-service
20+
build: store-services/product-service
2121
environment:
2222
- SPRING_PROFILES_ACTIVE=docker
2323
- MANAGEMENT_HEALTH_RABBIT_ENABLED=false
@@ -33,7 +33,7 @@ services:
3333
## Start - Recommendation service definition
3434
### Instance 1
3535
recommendation:
36-
build: recommendation-service
36+
build: store-services/recommendation-service
3737
environment:
3838
- SPRING_PROFILES_ACTIVE=docker
3939
- MANAGEMENT_HEALTH_RABBIT_ENABLED=false
@@ -46,7 +46,7 @@ services:
4646
- kafka
4747
### Instance 2
4848
recommendation-i1:
49-
build: recommendation-service
49+
build: store-services/recommendation-service
5050
environment:
5151
- SPRING_PROFILES_ACTIVE=docker
5252
- MANAGEMENT_HEALTH_RABBIT_ENABLED=false
@@ -62,7 +62,7 @@ services:
6262
## Start - Review service definition
6363
### Instance 1
6464
review:
65-
build: review-service
65+
build: store-services/review-service
6666
environment:
6767
- SPRING_PROFILES_ACTIVE=docker
6868
- MANAGEMENT_HEALTH_RABBIT_ENABLED=false
@@ -76,7 +76,7 @@ services:
7676
restart: on-failure
7777
### Instance 2
7878
review-i1:
79-
build: review-service
79+
build: store-services/review-service
8080
environment:
8181
- SPRING_PROFILES_ACTIVE=docker
8282
- MANAGEMENT_HEALTH_RABBIT_ENABLED=false
@@ -92,7 +92,7 @@ services:
9292

9393
## Start - Store service definition
9494
store:
95-
build: store-service
95+
build: store-services/store-service
9696
ports:
9797
- "8080:8080"
9898
environment:

‎docker-compose-partitions.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
## Start - Product service definition
55
### Instance 1
66
product:
7-
build: product-service
7+
build: store-services/product-service
88
environment:
99
- SPRING_PROFILES_ACTIVE=docker
1010
- SPRING_CLOUD_STREAM_BINDINGS_INPUT_CONSUMER_PARTITIONED=true
@@ -15,7 +15,7 @@ services:
1515
- rabbitmq
1616
### Instance 2
1717
product-i1:
18-
build: product-service
18+
build: store-services/product-service
1919
environment:
2020
- SPRING_PROFILES_ACTIVE=docker
2121
- SPRING_CLOUD_STREAM_BINDINGS_INPUT_CONSUMER_PARTITIONED=true
@@ -29,7 +29,7 @@ services:
2929
## Start - Recommendation service definition
3030
### Instance 1
3131
recommendation:
32-
build: recommendation-service
32+
build: store-services/recommendation-service
3333
environment:
3434
- SPRING_PROFILES_ACTIVE=docker
3535
- SPRING_CLOUD_STREAM_BINDINGS_INPUT_CONSUMER_PARTITIONED=true
@@ -40,7 +40,7 @@ services:
4040
- rabbitmq
4141
### Instance 2
4242
recommendation-i1:
43-
build: recommendation-service
43+
build: store-services/recommendation-service
4444
environment:
4545
- SPRING_PROFILES_ACTIVE=docker
4646
- SPRING_CLOUD_STREAM_BINDINGS_INPUT_CONSUMER_PARTITIONED=true
@@ -54,7 +54,7 @@ services:
5454
## Start - Review service definition
5555
### Instance 1
5656
review:
57-
build: review-service
57+
build: store-services/review-service
5858
environment:
5959
- SPRING_PROFILES_ACTIVE=docker
6060
- SPRING_CLOUD_STREAM_BINDINGS_INPUT_CONSUMER_PARTITIONED=true
@@ -66,7 +66,7 @@ services:
6666
restart: on-failure
6767
### Instance 2
6868
review-i1:
69-
build: review-service
69+
build: store-services/review-service
7070
environment:
7171
- SPRING_PROFILES_ACTIVE=docker
7272
- SPRING_CLOUD_STREAM_BINDINGS_INPUT_CONSUMER_PARTITIONED=true
@@ -80,7 +80,7 @@ services:
8080

8181
## Start - Store service definition
8282
store:
83-
build: store-service
83+
build: store-services/store-service
8484
ports:
8585
- "8080:8080"
8686
environment:

‎docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '3.7' ## Latest version works with Docker Engine release 18.06.0+
33
services:
44
## Start - Product service definition
55
product:
6-
build: product-service
6+
build: store-services/product-service
77
environment:
88
- SPRING_PROFILES_ACTIVE=docker
99
depends_on:
@@ -13,7 +13,7 @@ services:
1313

1414
## Start - Recommendation service definition
1515
recommendation:
16-
build: recommendation-service
16+
build: store-services/recommendation-service
1717
environment:
1818
- SPRING_PROFILES_ACTIVE=docker
1919
depends_on:
@@ -23,7 +23,7 @@ services:
2323

2424
## Start - Review service definition
2525
review:
26-
build: review-service
26+
build: store-services/review-service
2727
environment:
2828
- SPRING_PROFILES_ACTIVE=docker
2929
depends_on:
@@ -34,7 +34,7 @@ services:
3434

3535
## Start - Store service definition
3636
store:
37-
build: store-service
37+
build: store-services/store-service
3838
ports:
3939
- "8080:8080"
4040
environment:

‎pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
</properties>
1818

1919
<modules>
20-
<module>product-service</module>
21-
<module>review-service</module>
22-
<module>recommendation-service</module>
23-
<module>store-service</module>
24-
<module>store-api</module>
25-
<module>store-utils</module>
26-
<module>store-build-chassis</module>
27-
<module>store-service-chassis</module>
20+
<module>store-services/product-service</module>
21+
<module>store-services/review-service</module>
22+
<module>store-services/recommendation-service</module>
23+
<module>store-services/store-service</module>
24+
<module>store-common/store-api</module>
25+
<module>store-common/store-utils</module>
26+
<module>store-base/store-build-chassis</module>
27+
<module>store-base/store-service-chassis</module>
2828
</modules>
2929
</project>

‎run-em-all.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#!/usr/bin/env bash
22
## Author: Mohamed Taman
3-
## version: v1.0
4-
3+
## version: v4.2
4+
#### FIXME need to start up infra structure database and message services
55
echo -e "Starting [Springy Store] μServices ....\n\
66
---------------------------------------\n"
77

88
function runService(){
99
./mvnw --quiet spring-boot:run -Dspring-boot.run.jvmArguments="--enable-preview" -pl $1
1010
}
1111

12-
for dir in `find *-service -maxdepth 0 -type d`
12+
for dir in `find store-services/*-service -maxdepth 0 -type d`
1313
do
14-
echo -e "Starting [$dir] Microservice.... \n" && \
14+
echo -e "Starting [$dir] μService.... \n" && \
1515
runService "$dir" &
1616
done

‎setup.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
echo -e "\nInstalling all Springy store core shared modules"
55
echo -e "................................................\n"
66
echo "1- Installing [Parent Build Chassis] module..."
7-
./mvnw --quiet clean install -pl store-build-chassis || exit 126
7+
./mvnw --quiet clean install -pl store-base/store-build-chassis || exit 126
88
echo -e "Done successfully.\n"
99
echo "2- Installing shared [Services Utilities] module..."
10-
./mvnw --quiet clean install -pl store-utils || exit 126
10+
./mvnw --quiet clean install -pl store-common/store-utils || exit 126
1111
echo -e "Done successfully.\n"
1212
echo "3- Installing shared [Services APIs] module..."
13-
./mvnw --quiet clean install -pl store-api || exit 126
13+
./mvnw --quiet clean install -pl store-common/store-api || exit 126
1414
echo -e "Done successfully.\n"
1515
echo "4- Installing [Services Parent Chassis] module..."
16-
./mvnw --quiet clean install -pl store-service-chassis || exit 126
16+
./mvnw --quiet clean install -pl store-base/store-service-chassis || exit 126
1717
echo -e "Done successfully.\n"
1818

1919
echo -e "Woohoo, building & installing all project modules are finished successfully.\n\

‎stop-em-all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ echo -e "Stopping [Springy Store] μServices ....\n\
66
---------------------------------------\n"
77
for port in 9080 9081 9082 9083
88
do
9-
echo "Stopping Microservice at port $port ...."
9+
echo "Stopping μService at port $port ...."
1010
curl -X POST localhost:${port}/actuator/shutdown
11-
echo -e "\nMicroservice at port ${port} stopped successfully .... \n"
11+
echo -e "\nμService at port ${port} stopped successfully .... \n"
1212
done

‎store-build-chassis/pom.xml renamed to ‎store-base/store-build-chassis/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2525

2626
<!-- Dependencies versions properties -->
27-
<project.config.file.location>../config/maven/store.properties
27+
<project.config.file.location>../../config/maven/store.properties
2828
</project.config.file.location>
2929
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
3030
<maven.surefire.plugin.version>3.0.0-M4</maven.surefire.plugin.version>

‎store-service-chassis/pom.xml renamed to ‎store-base/store-service-chassis/pom.xml

File renamed without changes.

‎store-api/pom.xml renamed to ‎store-common/store-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<groupId>com.siriusxi.ms.store</groupId>
99
<artifactId>store-build-chassis</artifactId>
1010
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../store-build-chassis</relativePath>
11+
<relativePath>../store-base/store-build-chassis</relativePath>
1212
</parent>
1313

1414
<artifactId>store-api</artifactId>

0 commit comments

Comments
 (0)