Skip to content

Commit c24b25c

Browse files
ramon-tomas-cramon-tomas-c
committed
Merge branch 'eShopOnServiceFabric-Win' of https://github.com/dotnet-architecture/eShopOnContainers into eShopOnServiceFabric-Win
2 parents 248a3ac + cbb6b58 commit c24b25c

58 files changed

Lines changed: 1865 additions & 97 deletions

File tree

Some content is hidden

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

‎ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<Parameter Name="WebSPA_InstanceCount" DefaultValue="-1" />
1717
<Parameter Name="WebMVC_InstanceCount" DefaultValue="-1" />
1818
<Parameter Name="OrderingApi_InstanceCount" DefaultValue="-1" />
19-
<Parameter Name="IdentityApi_InstanceCount" DefaultValue="1" />
2019
<Parameter Name="CatalogApi_InstanceCount" DefaultValue="-1" />
2120
<Parameter Name="BasketApi_InstanceCount" DefaultValue="-1" />
2221
</Parameters>
@@ -86,33 +85,6 @@
8685
</ContainerHostPolicies>
8786
</Policies>
8887
</ServiceManifestImport>
89-
<ServiceManifestImport>
90-
<ServiceManifestRef ServiceManifestName="WebStatusPkg" ServiceManifestVersion="1.0.0" />
91-
<ConfigOverrides />
92-
<Policies>
93-
<ContainerHostPolicies CodePackageRef="Code">
94-
<PortBinding ContainerPort="80" EndpointRef="WebStatusTypeEndpoint"/>
95-
</ContainerHostPolicies>
96-
</Policies>
97-
</ServiceManifestImport>
98-
<ServiceManifestImport>
99-
<ServiceManifestRef ServiceManifestName="WebSPAPkg" ServiceManifestVersion="1.0.0" />
100-
<ConfigOverrides />
101-
<Policies>
102-
<ContainerHostPolicies CodePackageRef="Code">
103-
<PortBinding ContainerPort="80" EndpointRef="WebSPATypeEndpoint"/>
104-
</ContainerHostPolicies>
105-
</Policies>
106-
</ServiceManifestImport>
107-
<ServiceManifestImport>
108-
<ServiceManifestRef ServiceManifestName="WebMVCPkg" ServiceManifestVersion="1.0.0" />
109-
<ConfigOverrides />
110-
<Policies>
111-
<ContainerHostPolicies CodePackageRef="Code">
112-
<PortBinding ContainerPort="80" EndpointRef="WebMVCTypeEndpoint"/>
113-
</ContainerHostPolicies>
114-
</Policies>
115-
</ServiceManifestImport>
11688
<ServiceManifestImport>
11789
<ServiceManifestRef ServiceManifestName="OrderingApiPkg" ServiceManifestVersion="1.0.0" />
11890
<ConfigOverrides />
@@ -122,15 +94,6 @@
12294
</ContainerHostPolicies>
12395
</Policies>
12496
</ServiceManifestImport>
125-
<ServiceManifestImport>
126-
<ServiceManifestRef ServiceManifestName="IdentityApiPkg" ServiceManifestVersion="1.0.0" />
127-
<ConfigOverrides />
128-
<Policies>
129-
<ContainerHostPolicies CodePackageRef="Code">
130-
<PortBinding ContainerPort="80" EndpointRef="IdentityApiTypeEndpoint"/>
131-
</ContainerHostPolicies>
132-
</Policies>
133-
</ServiceManifestImport>
13497
<ServiceManifestImport>
13598
<ServiceManifestRef ServiceManifestName="CatalogApiPkg" ServiceManifestVersion="1.0.0" />
13699
<ConfigOverrides />
@@ -190,32 +153,11 @@
190153
<SingletonPartition />
191154
</StatelessService>
192155
</Service>
193-
194-
<Service Name="WebStatus" ServiceDnsName="webstatus.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
195-
<StatelessService ServiceTypeName="WebStatusType" InstanceCount="[WebStatus_InstanceCount]">
196-
<SingletonPartition />
197-
</StatelessService>
198-
</Service>
199-
<Service Name="WebSPA" ServiceDnsName="webspa.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
200-
<StatelessService ServiceTypeName="WebSPAType" InstanceCount="[WebSPA_InstanceCount]">
201-
<SingletonPartition />
202-
</StatelessService>
203-
</Service>
204-
<Service Name="WebMVC" ServiceDnsName="webmvc.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
205-
<StatelessService ServiceTypeName="WebMVCType" InstanceCount="[WebMVC_InstanceCount]">
206-
<SingletonPartition />
207-
</StatelessService>
208-
</Service>
209156
<Service Name="OrderingApi" ServiceDnsName="orderingapi.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
210157
<StatelessService ServiceTypeName="OrderingApiType" InstanceCount="[OrderingApi_InstanceCount]">
211158
<SingletonPartition />
212159
</StatelessService>
213160
</Service>
214-
<Service Name="IdentityApi" ServiceDnsName="identityapi.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
215-
<StatelessService ServiceTypeName="IdentityApiType" InstanceCount="[IdentityApi_InstanceCount]">
216-
<SingletonPartition />
217-
</StatelessService>
218-
</Service>
219161
<Service Name="CatalogApi" ServiceDnsName="catalogapi.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
220162
<StatelessService ServiceTypeName="CatalogApiType" InstanceCount="[CatalogApi_InstanceCount]">
221163
<SingletonPartition />

‎ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
2525
<EnvironmentVariable Name="ConnectionString" Value="basketdata.eshoponservicefabric"/>
2626
<EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
27-
<EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
27+
<EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_sf_dns:5105"/>
2828
<EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
2929
<EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
3030
<EnvironmentVariable Name="EventBusUserName" Value="admin"/>

‎ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
2424
<EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
2525
<EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word"/>
26-
<EnvironmentVariable Name="PicBaseUrl" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/CatalogApi/api/v1/catalog/items/[0]/pic/"/>
26+
<EnvironmentVariable Name="PicBaseUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/CatalogApi/api/v1/catalog/items/[0]/pic/"/>
2727
<EnvironmentVariable Name="AzureStorageAccountName" Value=""/>
2828
<EnvironmentVariable Name="AzureStorageAccountKey" Value=""/>
2929
<EnvironmentVariable Name="UseCustomizationData" Value="True"/>

‎ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<EnvironmentVariable Name="ConnectionString" Value="mongodb://mongodb.eshoponservicefabric"/>
2626
<EnvironmentVariable Name="Database" Value="LocationsDb"/>
2727
<EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
28-
<EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
28+
<EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_sf_dns:5105"/>
2929
<EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
3030
<EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
3131
<EnvironmentVariable Name="EventBusUserName" Value="admin"/>

‎ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<EnvironmentVariables>
2323
<EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
2424
<EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
25-
<EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word
26-
<EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
25+
<EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word"/>
26+
<EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_sf_dns:5105"/>
2727
<EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
2828
<EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
2929
<EnvironmentVariable Name="CampaignDetailFunctionUri" Value=""/>

‎ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
2525
<EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word"/>
2626
<EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
27-
<EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_dns_servicefabric:19081/eShopOnServiceFabric/IdentityApi"/>
27+
<EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_sf_dns:5105"/>
2828
<EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
2929
<EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
3030
<EnvironmentVariable Name="UseCustomizationData" Value="True"/>
@@ -45,7 +45,7 @@
4545
<!-- This endpoint is used by the communication listener to obtain the port on which to
4646
listen. Please note that if your service is partitioned, this port is shared with
4747
replicas of different partitions that are placed in your code. -->
48-
<Endpoint Name="OrderingApiTypeEndpoint" Port="80" UriScheme="http" PathSuffix="eShopOnServiceFabric/OrderingApi"/>
48+
<Endpoint Name="OrderingApiTypeEndpoint" Port="5102" UriScheme="http" PathSuffix="eShopOnServiceFabric/OrderingApi"/>
4949
</Endpoints>
5050
</Resources>
5151
</ServiceManifest>

‎ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@
88
<Parameter Name="PaymentApi_InstanceCount" Value="-1" />
99
<Parameter Name="RabbitMQ_InstanceCount" Value="-1" />
1010
<Parameter Name="SqlServer_InstanceCount" Value="-1" />
11-
<Parameter Name="WebStatus_InstanceCount" Value="-1" />
12-
<Parameter Name="WebSPA_InstanceCount" Value="-1" />
13-
<Parameter Name="WebMVC_InstanceCount" Value="-1" />
1411
<Parameter Name="SqlServer_InstanceCount" Value="-1" />
1512
<Parameter Name="OrderingApi_InstanceCount" Value="-1" />
16-
<Parameter Name="IdentityApi_InstanceCount" Value="-1" />
1713
<Parameter Name="CatalogApi_InstanceCount" Value="-1" />
1814
<Parameter Name="BasketApi_InstanceCount" Value="-1" />
1915
</Parameters>

‎ServiceFabric/eShopOnServiceFabric/PublishProfiles/Cloud.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
AzureActiveDirectory="true"
2121
ServerCertThumbprint="0123456789012345678901234567890123456789" />
2222
-->
23-
<ClusterConnectionParameters ConnectionEndpoint="your_dns_servicefabric:19000" />
23+
<ClusterConnectionParameters ConnectionEndpoint="your_sf_dns:19000" />
2424
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
2525
</PublishProfile>

‎ServiceFabric/eShopOnServiceFabric/eShopOnServiceFabric.sfproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
<Content Include="ApplicationPackageRoot\BasketDataPkg\ServiceManifest.xml" />
3535
<Content Include="ApplicationPackageRoot\CatalogApiPkg\Config\Settings.xml" />
3636
<Content Include="ApplicationPackageRoot\CatalogApiPkg\ServiceManifest.xml" />
37-
<Content Include="ApplicationPackageRoot\IdentityApiPkg\Config\Settings.xml" />
38-
<Content Include="ApplicationPackageRoot\IdentityApiPkg\ServiceManifest.xml" />
3937
<Content Include="ApplicationPackageRoot\LocationsApiPkg\Config\Settings.xml" />
4038
<Content Include="ApplicationPackageRoot\LocationsApiPkg\ServiceManifest.xml" />
4139
<Content Include="ApplicationPackageRoot\MarketingApiPkg\Config\Settings.xml" />
@@ -50,12 +48,6 @@
5048
<Content Include="ApplicationPackageRoot\RabbitMQPkg\ServiceManifest.xml" />
5149
<Content Include="ApplicationPackageRoot\SqlServerPkg\Config\Settings.xml" />
5250
<Content Include="ApplicationPackageRoot\SqlServerPkg\ServiceManifest.xml" />
53-
<Content Include="ApplicationPackageRoot\WebMVCPkg\Config\Settings.xml" />
54-
<Content Include="ApplicationPackageRoot\WebMVCPkg\ServiceManifest.xml" />
55-
<Content Include="ApplicationPackageRoot\WebSPAPkg\Config\Settings.xml" />
56-
<Content Include="ApplicationPackageRoot\WebSPAPkg\ServiceManifest.xml" />
57-
<Content Include="ApplicationPackageRoot\WebStatusPkg\Config\Settings.xml" />
58-
<Content Include="ApplicationPackageRoot\WebStatusPkg\ServiceManifest.xml" />
5951
<Content Include="packages.config" />
6052
</ItemGroup>
6153
<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />

‎ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/ApplicationManifest.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ApplicationManifest ApplicationTypeName="eShopOnServiceFabricIdSrvType"
3+
ApplicationTypeVersion="1.0.0"
4+
xmlns="http://schemas.microsoft.com/2011/01/fabric"
5+
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
6+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
7+
<Parameters>
8+
<Parameter Name="IdentityApi_InstanceCount" DefaultValue="-1" />
9+
</Parameters>
10+
<!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion
11+
should match the Name and Version attributes of the ServiceManifest element defined in the
12+
ServiceManifest.xml file. -->
13+
<ServiceManifestImport>
14+
<ServiceManifestRef ServiceManifestName="IdentityApiPkg" ServiceManifestVersion="1.0.0" />
15+
<ConfigOverrides />
16+
<Policies>
17+
<ContainerHostPolicies CodePackageRef="Code">
18+
<PortBinding ContainerPort="80" EndpointRef="IdentityApiTypeEndpoint"/>
19+
</ContainerHostPolicies>
20+
</Policies>
21+
</ServiceManifestImport>
22+
<DefaultServices>
23+
<!-- The section below creates instances of service types, when an instance of this
24+
application type is created. You can also create one or more instances of service type using the
25+
ServiceFabric PowerShell module.
26+
27+
The attribute ServiceTypeName below must match the name defined in the imported ServiceManifest.xml file. -->
28+
<Service Name="IdentityApi" ServiceDnsName="identityapi.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
29+
<StatelessService ServiceTypeName="IdentityApiType" InstanceCount="[IdentityApi_InstanceCount]">
30+
<SingletonPartition />
31+
</StatelessService>
32+
</Service>
33+
</DefaultServices>
34+
</ApplicationManifest>

0 commit comments

Comments
 (0)