Skip to content

Commit 80eb60e

Browse files
ethanhannethanhann
committed
Downgrade to ServiceStack client v3
1 parent 4776c1d commit 80eb60e

File tree

9 files changed

+85
-75
lines changed

9 files changed

+85
-75
lines changed

‎IntegrationEngine.Core.net40/IntegrationEngine.Core.net40.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,15 @@
6565
<Reference Include="RabbitMQ.Client">
6666
<HintPath>..\packages\RabbitMQ.Client.3.4.3\lib\net35\RabbitMQ.Client.dll</HintPath>
6767
</Reference>
68+
<Reference Include="ServiceStack.Common">
69+
<HintPath>..\packages\ServiceStack.Common.3.9.71\lib\net35\ServiceStack.Common.dll</HintPath>
70+
</Reference>
71+
<Reference Include="ServiceStack.Interfaces">
72+
<HintPath>..\packages\ServiceStack.Common.3.9.71\lib\net35\ServiceStack.Interfaces.dll</HintPath>
73+
</Reference>
74+
<Reference Include="ServiceStack.Text">
75+
<HintPath>..\packages\ServiceStack.Text.3.9.71\lib\net35\ServiceStack.Text.dll</HintPath>
76+
</Reference>
6877
<Reference Include="System" />
6978
<Reference Include="System.ComponentModel.DataAnnotations" />
7079
<Reference Include="System.Core" />
@@ -77,15 +86,6 @@
7786
<Reference Include="Newtonsoft.Json">
7887
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
7988
</Reference>
80-
<Reference Include="ServiceStack.Interfaces">
81-
<HintPath>..\packages\ServiceStack.Interfaces.4.0.36\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid\ServiceStack.Interfaces.dll</HintPath>
82-
</Reference>
83-
<Reference Include="ServiceStack.Text">
84-
<HintPath>..\packages\ServiceStack.Text.4.0.36\lib\net40\ServiceStack.Text.dll</HintPath>
85-
</Reference>
86-
<Reference Include="ServiceStack.Client">
87-
<HintPath>..\packages\ServiceStack.Client.4.0.36\lib\net40\ServiceStack.Client.dll</HintPath>
88-
</Reference>
8989
</ItemGroup>
9090
<ItemGroup>
9191
<Compile Include="..\configuration\SharedAssemblyInfo.cs">

‎IntegrationEngine.Core.net40/packages.config‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40" />
1212
<package id="NLog" version="3.1.0.0" targetFramework="net40" />
1313
<package id="RabbitMQ.Client" version="3.4.3" targetFramework="net40" />
14-
<package id="ServiceStack.Client" version="4.0.36" targetFramework="net40" />
15-
<package id="ServiceStack.Interfaces" version="4.0.36" targetFramework="net40" />
16-
<package id="ServiceStack.Text" version="4.0.36" targetFramework="net40" />
14+
<package id="ServiceStack.Common" version="3.9.71" targetFramework="net40" />
15+
<package id="ServiceStack.Text" version="3.9.71" targetFramework="net40" />
1716
</packages>

‎IntegrationEngine.Core/IntegrationEngine.Core.csproj‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@
4444
<Reference Include="NLog">
4545
<HintPath>..\packages\NLog.3.2.0.0\lib\net45\NLog.dll</HintPath>
4646
</Reference>
47+
<Reference Include="ServiceStack.Common">
48+
<HintPath>..\packages\ServiceStack.Common.3.9.71\lib\net35\ServiceStack.Common.dll</HintPath>
49+
</Reference>
50+
<Reference Include="ServiceStack.Interfaces">
51+
<HintPath>..\packages\ServiceStack.Common.3.9.71\lib\net35\ServiceStack.Interfaces.dll</HintPath>
52+
</Reference>
53+
<Reference Include="ServiceStack.Text">
54+
<HintPath>..\packages\ServiceStack.Text.3.9.71\lib\net35\ServiceStack.Text.dll</HintPath>
55+
</Reference>
4756
<Reference Include="System" />
4857
<Reference Include="System.ComponentModel.DataAnnotations" />
4958
<Reference Include="System.Core" />
@@ -77,15 +86,6 @@
7786
<Reference Include="Nest">
7887
<HintPath>..\packages\NEST.1.4.0\lib\net45\Nest.dll</HintPath>
7988
</Reference>
80-
<Reference Include="ServiceStack.Interfaces">
81-
<HintPath>..\packages\ServiceStack.Interfaces.4.0.36\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid\ServiceStack.Interfaces.dll</HintPath>
82-
</Reference>
83-
<Reference Include="ServiceStack.Text">
84-
<HintPath>..\packages\ServiceStack.Text.4.0.36\lib\net40\ServiceStack.Text.dll</HintPath>
85-
</Reference>
86-
<Reference Include="ServiceStack.Client">
87-
<HintPath>..\packages\ServiceStack.Client.4.0.36\lib\net40\ServiceStack.Client.dll</HintPath>
88-
</Reference>
8989
</ItemGroup>
9090
<ItemGroup>
9191
<Compile Include="..\configuration\SharedAssemblyInfo.cs">
@@ -166,7 +166,5 @@
166166
</Target>
167167
-->
168168
<ItemGroup />
169-
<ItemGroup>
170-
<Folder Include="ServiceStack\" />
171-
</ItemGroup>
169+
<ItemGroup />
172170
</Project>

‎IntegrationEngine.Core/ServiceStack/IJsonServiceClient.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
using IntegrationEngine.Core.IntegrationPoint;
22
using IntegrationEngine.Core.Configuration;
3+
using ServiceStack.Service;
34
using System;
45

56
namespace IntegrationEngine.Core.ServiceStack
67
{
7-
public interface IJsonServiceClient : IIntegrationPoint<IJsonServiceConfiguration>
8-
{
9-
}
8+
public interface IJsonServiceClient : IServiceClient, IIntegrationPoint<IJsonServiceConfiguration>
9+
{}
1010
}
11-

‎IntegrationEngine.Core/ServiceStack/JsonServiceClientAdapter.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using ServiceStack;
2-
using IntegrationEngine.Core.Configuration;
1+
using IntegrationEngine.Core.Configuration;
2+
using ServiceStack.ServiceClient.Web;
33
using System.Net;
44

55
namespace IntegrationEngine.Core.ServiceStack

‎IntegrationEngine.Core/packages.config‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1212
<package id="NLog" version="3.1.0.0" targetFramework="net45" />
1313
<package id="RabbitMQ.Client" version="3.4.3" targetFramework="net45" />
14-
<package id="ServiceStack.Client" version="4.0.36" targetFramework="net45" />
15-
<package id="ServiceStack.Interfaces" version="4.0.36" targetFramework="net45" />
16-
<package id="ServiceStack.Text" version="4.0.36" targetFramework="net45" />
14+
<package id="ServiceStack.Common" version="3.9.71" targetFramework="net45" />
15+
<package id="ServiceStack.Text" version="3.9.71" targetFramework="net45" />
1716
</packages>

‎IntegrationEngine/IntegrationEngine.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,15 @@
7474
<Reference Include="NLog">
7575
<HintPath>..\packages\NLog.3.1.0.0\lib\net45\NLog.dll</HintPath>
7676
</Reference>
77+
<Reference Include="ServiceStack.Common">
78+
<HintPath>..\packages\ServiceStack.Common.3.9.71\lib\net35\ServiceStack.Common.dll</HintPath>
79+
</Reference>
80+
<Reference Include="ServiceStack.Interfaces">
81+
<HintPath>..\packages\ServiceStack.Common.3.9.71\lib\net35\ServiceStack.Interfaces.dll</HintPath>
82+
</Reference>
83+
<Reference Include="ServiceStack.Text">
84+
<HintPath>..\packages\ServiceStack.Text.3.9.71\lib\net35\ServiceStack.Text.dll</HintPath>
85+
</Reference>
7786
<Reference Include="System" />
7887
<Reference Include="System.ComponentModel.DataAnnotations" />
7988
<Reference Include="System.Data" />
@@ -140,15 +149,6 @@
140149
<Reference Include="NLog.Targets.ElasticSearch">
141150
<HintPath>..\packages\NLog.Targets.ElasticSearch.0.9.5.0\lib\net40\NLog.Targets.ElasticSearch.dll</HintPath>
142151
</Reference>
143-
<Reference Include="ServiceStack.Interfaces">
144-
<HintPath>..\packages\ServiceStack.Interfaces.4.0.36\lib\portable-wp80+sl5+net40+win8+monotouch+monoandroid\ServiceStack.Interfaces.dll</HintPath>
145-
</Reference>
146-
<Reference Include="ServiceStack.Text">
147-
<HintPath>..\packages\ServiceStack.Text.4.0.36\lib\net40\ServiceStack.Text.dll</HintPath>
148-
</Reference>
149-
<Reference Include="ServiceStack.Client">
150-
<HintPath>..\packages\ServiceStack.Client.4.0.36\lib\net40\ServiceStack.Client.dll</HintPath>
151-
</Reference>
152152
</ItemGroup>
153153
<ItemGroup>
154154
<Compile Include="..\configuration\SharedAssemblyInfo.cs">

‎IntegrationEngine/packages.config‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
<package id="Owin" version="1.0" targetFramework="net45" />
2424
<package id="Quartz" version="2.3.1" targetFramework="net45" />
2525
<package id="RabbitMQ.Client" version="3.4.3" targetFramework="net45" />
26-
<package id="ServiceStack.Client" version="4.0.36" targetFramework="net45" />
27-
<package id="ServiceStack.Interfaces" version="4.0.36" targetFramework="net45" />
28-
<package id="ServiceStack.Text" version="4.0.36" targetFramework="net45" />
26+
<package id="ServiceStack.Common" version="3.9.71" targetFramework="net45" />
27+
<package id="ServiceStack.Text" version="3.9.71" targetFramework="net45" />
2928
<package id="Unity" version="3.5.1404.0" targetFramework="net45" />
3029
</packages>

‎configuration/IntegrationEngine.json‎

Lines changed: 46 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,53 @@
22
"WebApi": {
33
"HostName": "localhost",
44
"Port": 9001,
5-
"Origins": ["*"]
5+
"Origins": [ "*" ]
6+
},
7+
"NLogAdapter": {
8+
"ConfigType": "File",
9+
"ConfigFile": "IntegrationEngine.nlog.xml"
610
},
7-
"NLogAdapter": {
8-
"ConfigType": "File",
9-
"ConfigFile": "IntegrationEngine.nlog.xml"
10-
},
1111
"IntegrationPoints": {
12-
"Mail": [{
13-
"IntegrationPointName": "DefaultMail",
14-
"HostName": "localhost",
15-
"Port": 25
16-
}, {
17-
"IntegrationPointName": "FooMailClient",
18-
"HostName": "localhost",
19-
"Port": 25
20-
}],
21-
"RabbitMQ": [{
22-
"IntegrationPointName": "DefaultRabbitMQ",
23-
"QueueName": "myqueue",
24-
"ExchangeName": "amq.direct",
25-
"UserName": "inengine",
26-
"Password": "secret",
27-
"HostName": "localhost",
28-
"VirtualHost": "/"
29-
}],
30-
"Elasticsearch": [{
31-
"IntegrationPointName": "DefaultElasticsearch",
32-
"Protocol": "http",
33-
"HostName": "localhost",
34-
"Port": 9200,
35-
"DefaultIndex": "integration-engine"
36-
}]
12+
"Mail": [
13+
{
14+
"IntegrationPointName": "DefaultMail",
15+
"HostName": "localhost",
16+
"Port": 25
17+
},
18+
{
19+
"IntegrationPointName": "FooMailClient",
20+
"HostName": "localhost",
21+
"Port": 25
22+
}
23+
],
24+
"RabbitMQ": [
25+
{
26+
"IntegrationPointName": "DefaultRabbitMQ",
27+
"QueueName": "myqueue",
28+
"ExchangeName": "amq.direct",
29+
"UserName": "inengine",
30+
"Password": "secret",
31+
"HostName": "localhost",
32+
"VirtualHost": "/"
33+
}
34+
],
35+
"Elasticsearch": [
36+
{
37+
"IntegrationPointName": "DefaultElasticsearch",
38+
"Protocol": "http",
39+
"HostName": "localhost",
40+
"Port": 9200,
41+
"DefaultIndex": "integration-engine"
42+
}
43+
],
44+
"JsonService": [
45+
{
46+
"IntegrationPointName": "ExampleJsonService",
47+
"BaseUri": "http://example.com",
48+
"UserName": "inengine",
49+
"Password": "secret",
50+
"AlwaysSendBasicAuthHeader": true
51+
}
52+
]
3753
}
3854
}

0 commit comments

Comments
 (0)