Files moved / names changes / csprojs updated / sln updated

kphan714 · Feb 28, 2018 · de37559 · de37559
1 parent 152fcc8
commit de37559
Show file tree

Hide file tree

Showing 66 changed files with 245 additions and 216 deletions.
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
@@ -219,23 +219,23 @@ services:
       - "15672:15672"
       - "5672:5672"
 
-# mobileshoppingapigw:
-#   environment:
-#     - ASPNETCORE_ENVIRONMENT=Development
-#     - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-#   ports:
-#     - "5200:80"
-#   volumes:
-#     - ./src/Apigw/configs/mobileshoppingapigw:/app/configuration
-#
-# mobilemarketingapigw:
-#   environment:
-#     - ASPNETCORE_ENVIRONMENT=Development
-#     - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-#   ports:
-#     - "5201:80"
-#   volumes:
-#     - ./src/Apigw/configs/mobilemarketingapigw:/app/configuration
+  mobileshoppingapigw:
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+      - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+    ports:
+      - "5200:80"
+    volumes:
+      - ./src/ApiGateways/Mobile.Bff.Shopping/apigw:/app/configuration
+ 
+  mobilemarketingapigw:
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+      - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+    ports:
+      - "5201:80"
+    volumes:
+      - ./src/ApiGateways/Mobile.Bff.Marketing/apigw:/app/configuration
 
   webshoppingapigw:
     environment:
@@ -244,16 +244,16 @@ services:
     ports:
       - "5202:80"
     volumes:
-      - ./src/Apigw/configs/webshoppingapigw:/app/configuration
+      - ./src/ApiGateways/Web.Bff.Shopping/apigw:/app/configuration
 
-# webmarketingapigw:
-#   environment:
-#     - ASPNETCORE_ENVIRONMENT=Development
-#     - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
-#   ports:
-#     - "5203:80"
-#   volumes:
-#     - ./src/Apigw/configs/webmarketingapigw:/app/configuration
+  webmarketingapigw:
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+      - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+    ports:
+      - "5203:80"
+    volumes:
+      - ./src/ApiGateways/Web.Bff.Marketing/apigw:/app/configuration
 
   mobileshoppingagg:
     environment:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -108,39 +108,39 @@ services:
   rabbitmq:
     image: rabbitmq:3-management-alpine
 
-# mobileshoppingapigw:
-#   image: eshop/ocelotapigw-ms
-#   build:
-#     context: .
-#     dockerfile: src/Apigw/OcelotApiGw/Dockerfile
-#
-# mobilemarketingapigw:
-#   image: eshop/ocelotapigw-mm
-#   build:
-#     context: .
-#     dockerfile: src/Apigw/OcelotApiGw/Dockerfile2
-#
+  mobileshoppingapigw:
+    image: eshop/ocelotapigw-ms
+    build:
+      context: .
+      dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
+ 
+  mobilemarketingapigw:
+    image: eshop/ocelotapigw-mm
+    build:
+      context: .
+      dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile2
+ 
   webshoppingapigw:
     image: eshop/ocelotapigw-ws
     build:
       context: .
-      dockerfile: src/Apigw/OcelotApiGw/Dockerfile3
+      dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile3
 
-# webmarketingapigw:
-#   image: eshop/ocelotapigw-wm
-#   build:
-#     context: .
-#     dockerfile: src/Apigw/OcelotApiGw/Dockerfile4
+  webmarketingapigw:
+    image: eshop/ocelotapigw-wm
+    build:
+      context: .
+      dockerfile: src/ApiGateways/ApiGw-Base/Dockerfile
 
   mobileshoppingagg:
     image: eshop/mobileshoppingagg
     build:
       context: .
-      dockerfile: src/Aggregators/Mobile.Shopping.HttpAggregator/Dockerfile
+      dockerfile: src/ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
 
   webshoppingagg:
     image: eshop/webshoppingagg
     build:
       context: .
-      dockerfile: src/Aggregators/Web.Shopping.HttpAggregator/Dockerfile
+      dockerfile: src/ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
 
diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln
diff --git a/src/Apigw/OcelotApiGw/Dockerfile → src/ApiGateways/ApiGw-Base/Dockerfile b/src/Apigw/OcelotApiGw/Dockerfile → src/ApiGateways/ApiGw-Base/Dockerfile
@@ -1,13 +1,14 @@
 FROM microsoft/aspnetcore:2.0 AS base
 WORKDIR /app
+ENV ESHOP_API_GW  Mobile_Bff_Shopping_ApiGw
 EXPOSE 80
 
 FROM microsoft/aspnetcore-build:2.0 AS build
 WORKDIR /src
-COPY src/Apigw/OcelotApiGw/OcelotApiGw.csproj src/Apigw/OcelotApiGw/
-RUN dotnet restore src/Apigw/OcelotApiGw/
+COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/
+RUN dotnet restore src/ApiGateways/ApiGw-Base/
 COPY . .
-WORKDIR /src/src/Apigw/OcelotApiGw
+WORKDIR /src/src/ApiGateways/ApiGw-Base/
 RUN dotnet build -c Release -o /app
 
 FROM build AS publish

diff --git a/src/Apigw/OcelotApiGw/Dockerfile2 → src/ApiGateways/ApiGw-Base/Dockerfile2 b/src/Apigw/OcelotApiGw/Dockerfile2 → src/ApiGateways/ApiGw-Base/Dockerfile2
@@ -1,13 +1,14 @@
 FROM microsoft/aspnetcore:2.0 AS base
 WORKDIR /app
+ENV ESHOP_API_GW  Mobile_Bff_Marketing_ApiGw
 EXPOSE 80
 
 FROM microsoft/aspnetcore-build:2.0 AS build
 WORKDIR /src
-COPY src/Apigw/OcelotApiGw/OcelotApiGw.csproj src/Apigw/OcelotApiGw/
-RUN dotnet restore src/Apigw/OcelotApiGw/
+COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/
+RUN dotnet restore src/ApiGateways/ApiGw-Base/
 COPY . .
-WORKDIR /src/src/Apigw/OcelotApiGw
+WORKDIR /src/src/ApiGateways/ApiGw-Base/
 RUN dotnet build -c Release -o /app
 
 FROM build AS publish

diff --git a/src/Apigw/OcelotApiGw/Dockerfile3 → src/ApiGateways/ApiGw-Base/Dockerfile3 b/src/Apigw/OcelotApiGw/Dockerfile3 → src/ApiGateways/ApiGw-Base/Dockerfile3
@@ -1,13 +1,14 @@
 FROM microsoft/aspnetcore:2.0 AS base
 WORKDIR /app
+ENV ESHOP_API_GW  Web_Bff_Shopping_ApiGw
 EXPOSE 80
 
 FROM microsoft/aspnetcore-build:2.0 AS build
 WORKDIR /src
-COPY src/Apigw/OcelotApiGw/OcelotApiGw.csproj src/Apigw/OcelotApiGw/
-RUN dotnet restore src/Apigw/OcelotApiGw/
+COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/
+RUN dotnet restore src/ApiGateways/ApiGw-Base/
 COPY . .
-WORKDIR /src/src/Apigw/OcelotApiGw
+WORKDIR /src/src/ApiGateways/ApiGw-Base/
 RUN dotnet build -c Release -o /app
 
 FROM build AS publish

diff --git a/src/Apigw/OcelotApiGw/Dockerfile4 → src/ApiGateways/ApiGw-Base/Dockerfile4 b/src/Apigw/OcelotApiGw/Dockerfile4 → src/ApiGateways/ApiGw-Base/Dockerfile4
@@ -1,13 +1,14 @@
 FROM microsoft/aspnetcore:2.0 AS base
 WORKDIR /app
+ENV ESHOP_API_GW  Web_Bff_Marketing_ApiGw
 EXPOSE 80
 
 FROM microsoft/aspnetcore-build:2.0 AS build
 WORKDIR /src
-COPY src/Apigw/OcelotApiGw/OcelotApiGw.csproj src/Apigw/OcelotApiGw/
-RUN dotnet restore src/Apigw/OcelotApiGw/
+COPY src/ApiGateways/ApiGw-Base/OcelotApiGw.csproj src/ApiGateways/ApiGw-Base/
+RUN dotnet restore src/ApiGateways/ApiGw-Base/
 COPY . .
-WORKDIR /src/src/Apigw/OcelotApiGw
+WORKDIR /src/src/ApiGateways/ApiGw-Base/
 RUN dotnet build -c Release -o /app
 
 FROM build AS publish

diff --git a/src/Apigw/OcelotApiGw/OcelotApiGw.csproj → ...ApiGateways/ApiGw-Base/OcelotApiGw.csproj b/src/Apigw/OcelotApiGw/OcelotApiGw.csproj → ...ApiGateways/ApiGw-Base/OcelotApiGw.csproj
diff --git a/src/Apigw/OcelotApiGw/Program.cs → src/ApiGateways/ApiGw-Base/Program.cs b/src/Apigw/OcelotApiGw/Program.cs → src/ApiGateways/ApiGw-Base/Program.cs
diff --git a/...celotApiGw/Properties/launchSettings.json → ...ApiGw-Base/Properties/launchSettings.json b/...celotApiGw/Properties/launchSettings.json → ...ApiGw-Base/Properties/launchSettings.json
diff --git a/src/Apigw/OcelotApiGw/Startup.cs → src/ApiGateways/ApiGw-Base/Startup.cs b/src/Apigw/OcelotApiGw/Startup.cs → src/ApiGateways/ApiGw-Base/Startup.cs
diff --git a/src/Apigw/OcelotApiGw/appsettings.json → src/ApiGateways/ApiGw-Base/appsettings.json b/src/Apigw/OcelotApiGw/appsettings.json → src/ApiGateways/ApiGw-Base/appsettings.json
diff --git a/...s/mobilemarketingapigw/configuration.json → ...le.Bff.Marketing/apigw/configuration.json b/...s/mobilemarketingapigw/configuration.json → ...le.Bff.Marketing/apigw/configuration.json
diff --git a/...pping.HttpAggregator/Config/UrlsConfig.cs → ....Shopping/aggregator/Config/UrlsConfig.cs b/...pping.HttpAggregator/Config/UrlsConfig.cs → ....Shopping/aggregator/Config/UrlsConfig.cs
diff --git a/...ggregator/Controllers/BasketController.cs → ...ggregator/Controllers/BasketController.cs b/...ggregator/Controllers/BasketController.cs → ...ggregator/Controllers/BasketController.cs
diff --git a/...pAggregator/Controllers/HomeController.cs → .../aggregator/Controllers/HomeController.cs b/...pAggregator/Controllers/HomeController.cs → .../aggregator/Controllers/HomeController.cs
diff --git a/...Aggregator/Controllers/OrderController.cs → ...aggregator/Controllers/OrderController.cs b/...Aggregator/Controllers/OrderController.cs → ...aggregator/Controllers/OrderController.cs
diff --git a/...Mobile.Shopping.HttpAggregator/Dockerfile → ...Mobile.Bff.Shopping/aggregator/Dockerfile b/...Mobile.Shopping.HttpAggregator/Dockerfile → ...Mobile.Bff.Shopping/aggregator/Dockerfile
@@ -6,7 +6,7 @@ FROM microsoft/aspnetcore-build:2.0 AS build
 WORKDIR /src
 COPY . .
 RUN dotnet restore -nowarn:msb3202,nu1503
-WORKDIR /src/src/Aggregators/Mobile.Shopping.HttpAggregator
+WORKDIR /src/src/ApiGateways/Mobile.Bff.Shopping/aggregator
 RUN dotnet build --no-restore -c Release -o /app
 
 FROM build AS publish
@@ -16,3 +16,4 @@ FROM base AS final
 WORKDIR /app
 COPY --from=publish /app .
 ENTRYPOINT ["dotnet", "Mobile.Shopping.HttpAggregator.dll"]
+
diff --git a/.../Filters/AuthorizeCheckOperationFilter.cs → .../Filters/AuthorizeCheckOperationFilter.cs b/.../Filters/AuthorizeCheckOperationFilter.cs → .../Filters/AuthorizeCheckOperationFilter.cs
diff --git a/...tor/Mobile.Shopping.HttpAggregator.csproj → ...tor/Mobile.Shopping.HttpAggregator.csproj b/...tor/Mobile.Shopping.HttpAggregator.csproj → ...tor/Mobile.Shopping.HttpAggregator.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\BuildingBlocks\Resilience\Resilience.Http\Resilience.Http.csproj" />
+    <ProjectReference Include="..\..\..\BuildingBlocks\Resilience\Resilience.Http\Resilience.Http.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...Aggregator/Models/AddBasketItemRequest.cs → ...aggregator/Models/AddBasketItemRequest.cs b/...Aggregator/Models/AddBasketItemRequest.cs → ...aggregator/Models/AddBasketItemRequest.cs
diff --git a/...pping.HttpAggregator/Models/BasketData.cs → ....Shopping/aggregator/Models/BasketData.cs b/...pping.HttpAggregator/Models/BasketData.cs → ....Shopping/aggregator/Models/BasketData.cs
diff --git a/...ping.HttpAggregator/Models/CatalogItem.cs → ...Shopping/aggregator/Models/CatalogItem.cs b/...ping.HttpAggregator/Models/CatalogItem.cs → ...Shopping/aggregator/Models/CatalogItem.cs
diff --git a/...opping.HttpAggregator/Models/OrderData.cs → ...f.Shopping/aggregator/Models/OrderData.cs b/...opping.HttpAggregator/Models/OrderData.cs → ...f.Shopping/aggregator/Models/OrderData.cs
diff --git a/...ng.HttpAggregator/Models/OrderItemData.cs → ...opping/aggregator/Models/OrderItemData.cs b/...ng.HttpAggregator/Models/OrderItemData.cs → ...opping/aggregator/Models/OrderItemData.cs
diff --git a/...egator/Models/UpdateBasketItemsRequest.cs → ...egator/Models/UpdateBasketItemsRequest.cs b/...egator/Models/UpdateBasketItemsRequest.cs → ...egator/Models/UpdateBasketItemsRequest.cs
diff --git a/...pAggregator/Models/UpdateBasketRequest.cs → .../aggregator/Models/UpdateBasketRequest.cs b/...pAggregator/Models/UpdateBasketRequest.cs → .../aggregator/Models/UpdateBasketRequest.cs
diff --git a/...Mobile.Shopping.HttpAggregator/Program.cs → ...Mobile.Bff.Shopping/aggregator/Program.cs b/...Mobile.Shopping.HttpAggregator/Program.cs → ...Mobile.Bff.Shopping/aggregator/Program.cs
diff --git a/...Aggregator/Properties/launchSettings.json → ...aggregator/Properties/launchSettings.json b/...Aggregator/Properties/launchSettings.json → ...aggregator/Properties/launchSettings.json
diff --git a/....HttpAggregator/Services/BasketService.cs → ...ping/aggregator/Services/BasketService.cs b/....HttpAggregator/Services/BasketService.cs → ...ping/aggregator/Services/BasketService.cs
diff --git a/...HttpAggregator/Services/CatalogService.cs → ...ing/aggregator/Services/CatalogService.cs b/...HttpAggregator/Services/CatalogService.cs → ...ing/aggregator/Services/CatalogService.cs
diff --git a/...HttpAggregator/Services/IBasketService.cs → ...ing/aggregator/Services/IBasketService.cs b/...HttpAggregator/Services/IBasketService.cs → ...ing/aggregator/Services/IBasketService.cs
diff --git a/...ttpAggregator/Services/ICatalogService.cs → ...ng/aggregator/Services/ICatalogService.cs b/...ttpAggregator/Services/ICatalogService.cs → ...ng/aggregator/Services/ICatalogService.cs
diff --git a/...ttpAggregator/Services/IOrderApiClient.cs → ...ng/aggregator/Services/IOrderApiClient.cs b/...ttpAggregator/Services/IOrderApiClient.cs → ...ng/aggregator/Services/IOrderApiClient.cs
diff --git a/...HttpAggregator/Services/OrderApiClient.cs → ...ing/aggregator/Services/OrderApiClient.cs b/...HttpAggregator/Services/OrderApiClient.cs → ...ing/aggregator/Services/OrderApiClient.cs
diff --git a/...Mobile.Shopping.HttpAggregator/Startup.cs → ...Mobile.Bff.Shopping/aggregator/Startup.cs b/...Mobile.Shopping.HttpAggregator/Startup.cs → ...Mobile.Bff.Shopping/aggregator/Startup.cs
diff --git a/....Shopping.HttpAggregator/appsettings.json → ....Bff.Shopping/aggregator/appsettings.json b/....Shopping.HttpAggregator/appsettings.json → ....Bff.Shopping/aggregator/appsettings.json
diff --git a/...HttpAggregator/appsettings.localhost.json → ...ing/aggregator/appsettings.localhost.json b/...HttpAggregator/appsettings.localhost.json → ...ing/aggregator/appsettings.localhost.json
diff --git a/...gs/mobileshoppingapigw/configuration.json → ...ile.Bff.Shopping/apigw/configuration.json b/...gs/mobileshoppingapigw/configuration.json → ...ile.Bff.Shopping/apigw/configuration.json
diff --git a/...figs/webmarketingapigw/configuration.json → ...eb.Bff.Marketing/apigw/configuration.json b/...figs/webmarketingapigw/configuration.json → ...eb.Bff.Marketing/apigw/configuration.json
diff --git a/...pping.HttpAggregator/Config/UrlsConfig.cs → ....Shopping/aggregator/Config/UrlsConfig.cs b/...pping.HttpAggregator/Config/UrlsConfig.cs → ....Shopping/aggregator/Config/UrlsConfig.cs
diff --git a/...ggregator/Controllers/BasketController.cs → ...ggregator/Controllers/BasketController.cs b/...ggregator/Controllers/BasketController.cs → ...ggregator/Controllers/BasketController.cs
diff --git a/...pAggregator/Controllers/HomeController.cs → .../aggregator/Controllers/HomeController.cs b/...pAggregator/Controllers/HomeController.cs → .../aggregator/Controllers/HomeController.cs
diff --git a/...Aggregator/Controllers/OrderController.cs → ...aggregator/Controllers/OrderController.cs b/...Aggregator/Controllers/OrderController.cs → ...aggregator/Controllers/OrderController.cs
diff --git a/...rs/Web.Shopping.HttpAggregator/Dockerfile → ...ys/Web.Bff.Shopping/aggregator/Dockerfile b/...rs/Web.Shopping.HttpAggregator/Dockerfile → ...ys/Web.Bff.Shopping/aggregator/Dockerfile
@@ -6,7 +6,7 @@ FROM microsoft/aspnetcore-build:2.0 AS build
 WORKDIR /src
 COPY . .
 RUN dotnet restore -nowarn:msb3202,nu1503
-WORKDIR /src/src/Aggregators/Web.Shopping.HttpAggregator
+WORKDIR /src/src/ApiGateways/Web.Bff.Shopping/aggregator
 RUN dotnet build --no-restore -c Release -o /app
 
 FROM build AS publish

diff --git a/.../Filters/AuthorizeCheckOperationFilter.cs → .../Filters/AuthorizeCheckOperationFilter.cs b/.../Filters/AuthorizeCheckOperationFilter.cs → .../Filters/AuthorizeCheckOperationFilter.cs
diff --git a/...Aggregator/Models/AddBasketItemRequest.cs → ...aggregator/Models/AddBasketItemRequest.cs b/...Aggregator/Models/AddBasketItemRequest.cs → ...aggregator/Models/AddBasketItemRequest.cs
diff --git a/...pping.HttpAggregator/Models/BasketData.cs → ....Shopping/aggregator/Models/BasketData.cs b/...pping.HttpAggregator/Models/BasketData.cs → ....Shopping/aggregator/Models/BasketData.cs
diff --git a/...ping.HttpAggregator/Models/CatalogItem.cs → ...Shopping/aggregator/Models/CatalogItem.cs b/...ping.HttpAggregator/Models/CatalogItem.cs → ...Shopping/aggregator/Models/CatalogItem.cs
diff --git a/...opping.HttpAggregator/Models/OrderData.cs → ...f.Shopping/aggregator/Models/OrderData.cs b/...opping.HttpAggregator/Models/OrderData.cs → ...f.Shopping/aggregator/Models/OrderData.cs
diff --git a/...ng.HttpAggregator/Models/OrderItemData.cs → ...opping/aggregator/Models/OrderItemData.cs b/...ng.HttpAggregator/Models/OrderItemData.cs → ...opping/aggregator/Models/OrderItemData.cs
diff --git a/...egator/Models/UpdateBasketItemsRequest.cs → ...egator/Models/UpdateBasketItemsRequest.cs b/...egator/Models/UpdateBasketItemsRequest.cs → ...egator/Models/UpdateBasketItemsRequest.cs
diff --git a/...pAggregator/Models/UpdateBasketRequest.cs → .../aggregator/Models/UpdateBasketRequest.cs b/...pAggregator/Models/UpdateBasketRequest.cs → .../aggregator/Models/UpdateBasketRequest.cs
diff --git a/...rs/Web.Shopping.HttpAggregator/Program.cs → ...ys/Web.Bff.Shopping/aggregator/Program.cs b/...rs/Web.Shopping.HttpAggregator/Program.cs → ...ys/Web.Bff.Shopping/aggregator/Program.cs
diff --git a/...Aggregator/Properties/launchSettings.json → ...aggregator/Properties/launchSettings.json b/...Aggregator/Properties/launchSettings.json → ...aggregator/Properties/launchSettings.json
diff --git a/....HttpAggregator/Services/BasketService.cs → ...ping/aggregator/Services/BasketService.cs b/....HttpAggregator/Services/BasketService.cs → ...ping/aggregator/Services/BasketService.cs
diff --git a/...HttpAggregator/Services/CatalogService.cs → ...ing/aggregator/Services/CatalogService.cs b/...HttpAggregator/Services/CatalogService.cs → ...ing/aggregator/Services/CatalogService.cs
diff --git a/...HttpAggregator/Services/IBasketService.cs → ...ing/aggregator/Services/IBasketService.cs b/...HttpAggregator/Services/IBasketService.cs → ...ing/aggregator/Services/IBasketService.cs
diff --git a/...ttpAggregator/Services/ICatalogService.cs → ...ng/aggregator/Services/ICatalogService.cs b/...ttpAggregator/Services/ICatalogService.cs → ...ng/aggregator/Services/ICatalogService.cs
diff --git a/...ttpAggregator/Services/IOrderApiClient.cs → ...ng/aggregator/Services/IOrderApiClient.cs b/...ttpAggregator/Services/IOrderApiClient.cs → ...ng/aggregator/Services/IOrderApiClient.cs
diff --git a/...HttpAggregator/Services/OrderApiClient.cs → ...ing/aggregator/Services/OrderApiClient.cs b/...HttpAggregator/Services/OrderApiClient.cs → ...ing/aggregator/Services/OrderApiClient.cs
diff --git a/...rs/Web.Shopping.HttpAggregator/Startup.cs → ...ys/Web.Bff.Shopping/aggregator/Startup.cs b/...rs/Web.Shopping.HttpAggregator/Startup.cs → ...ys/Web.Bff.Shopping/aggregator/Startup.cs
diff --git a/...egator/Web.Shopping.HttpAggregator.csproj → ...egator/Web.Shopping.HttpAggregator.csproj b/...egator/Web.Shopping.HttpAggregator.csproj → ...egator/Web.Shopping.HttpAggregator.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\BuildingBlocks\Resilience\Resilience.Http\Resilience.Http.csproj" />
+    <ProjectReference Include="..\..\..\BuildingBlocks\Resilience\Resilience.Http\Resilience.Http.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/....Shopping.HttpAggregator/appsettings.json → ....Bff.Shopping/aggregator/appsettings.json b/....Shopping.HttpAggregator/appsettings.json → ....Bff.Shopping/aggregator/appsettings.json
diff --git a/...HttpAggregator/appsettings.localhost.json → ...ing/aggregator/appsettings.localhost.json b/...HttpAggregator/appsettings.localhost.json → ...ing/aggregator/appsettings.localhost.json
diff --git a/...nfigs/webshoppingapigw/configuration.json → ...Web.Bff.Shopping/apigw/configuration.json b/...nfigs/webshoppingapigw/configuration.json → ...Web.Bff.Shopping/apigw/configuration.json