Skip to content

Commit ce92c70

Browse files
author
Jeroen
committed
Merge branch 'release/4.0.0'
2 parents a5b2207 + f048073 commit ce92c70

23 files changed

+290
-203
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,4 @@ $RECYCLE.BIN/
151151
# Mac crap
152152
.DS_Store
153153

154+
.vs/config/applicationhost.config

‎EPi.Libraries.Keywords.Alchemy/AlchemyExtractionService.cs‎

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright© 2015 Jeroen Stemerdink. All Rights Reserved.
2-
//
1+
// Copyright © 2016 Jeroen Stemerdink.
32
// Permission is hereby granted, free of charge, to any person
43
// obtaining a copy of this software and associated documentation
54
// files (the "Software"), to deal in the Software without
@@ -8,10 +7,8 @@
87
// copies of the Software, and to permit persons to whom the
98
// Software is furnished to do so, subject to the following
109
// conditions:
11-
//
1210
// The above copyright notice and this permission notice shall be
1311
// included in all copies or substantial portions of the Software.
14-
//
1512
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1613
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
1714
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -20,45 +17,38 @@
2017
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
2118
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
2219
// OTHER DEALINGS IN THE SOFTWARE.
20+
namespace EPi.Libraries.Keywords.Alchemy
21+
{
22+
using System;
23+
using System.Collections.Generic;
24+
using System.Collections.ObjectModel;
25+
using System.Configuration;
26+
using System.Globalization;
27+
using System.IO;
28+
using System.Linq;
29+
using System.Net;
30+
using System.Text;
31+
using System.Web;
2332

24-
using System;
25-
using System.Collections.Generic;
26-
using System.Collections.ObjectModel;
27-
using System.Configuration;
28-
using System.Globalization;
29-
using System.IO;
30-
using System.Linq;
31-
using System.Net;
32-
using System.Text;
33-
using System.Web;
34-
35-
using EPi.Libraries.Keywords.Alchemy.Models;
33+
using EPi.Libraries.Keywords.Alchemy.Models;
3634

37-
using EPiServer;
38-
using EPiServer.Logging;
39-
using EPiServer.ServiceLocation;
35+
using EPiServer;
36+
using EPiServer.Logging;
37+
using EPiServer.ServiceLocation;
4038

41-
using Newtonsoft.Json;
39+
using Newtonsoft.Json;
4240

43-
namespace EPi.Libraries.Keywords.Alchemy
44-
{
4541
/// <summary>
4642
/// Class AlchemyExtractionService.
4743
/// </summary>
4844
[ServiceConfiguration(typeof(IExtractionService))]
4945
public class AlchemyExtractionService : IExtractionService
5046
{
51-
#region Static Fields
52-
5347
/// <summary>
5448
/// The logger
5549
/// </summary>
5650
private static readonly ILogger Logger = LogManager.GetLogger(typeof(KeywordsInitialization));
5751

58-
#endregion
59-
60-
#region Properties
61-
6252
/// <summary>
6353
/// Gets or sets the content repository.
6454
/// </summary>
@@ -96,10 +86,6 @@ private static int MaxItems
9686
}
9787
}
9888

99-
#endregion
100-
101-
#region Public Methods and Operators
102-
10389
/// <summary>
10490
/// Gets the keywords.
10591
/// </summary>
@@ -111,6 +97,7 @@ public ReadOnlyCollection<string> GetKeywords(string text)
11197
{
11298
return new ReadOnlyCollection<string>(new List<string>());
11399
}
100+
114101
try
115102
{
116103
Uri uri;
@@ -174,7 +161,5 @@ public ReadOnlyCollection<string> GetKeywords(string text)
174161
return new ReadOnlyCollection<string>(new List<string>());
175162
}
176163
}
177-
178-
#endregion
179164
}
180165
}

‎EPi.Libraries.Keywords.Alchemy/EPi.Libraries.Keywords.Alchemy.csproj‎

Lines changed: 63 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
1616
<TargetFrameworkProfile />
17-
<NuGetPackageImportStamp>229bb744</NuGetPackageImportStamp>
17+
<NuGetPackageImportStamp>
18+
</NuGetPackageImportStamp>
1819
</PropertyGroup>
1920
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2021
<DebugSymbols>true</DebugSymbols>
@@ -43,6 +44,7 @@
4344
<CodeAnalysisRuleSet>..\Solution Files\EPiServer.Libraries.ruleset</CodeAnalysisRuleSet>
4445
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
4546
<Prefer32Bit>false</Prefer32Bit>
47+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
4648
</PropertyGroup>
4749
<PropertyGroup>
4850
<SignAssembly>true</SignAssembly>
@@ -51,22 +53,75 @@
5153
<AssemblyOriginatorKeyFile>EPiServer.Libraries.snk</AssemblyOriginatorKeyFile>
5254
</PropertyGroup>
5355
<ItemGroup>
54-
<Reference Include="EPiServer, Version=9.0.3.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
55-
<HintPath>..\packages\EPiServer.CMS.Core.9.0.3\lib\net45\EPiServer.dll</HintPath>
56+
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
57+
<HintPath>..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
58+
<Private>True</Private>
59+
</Reference>
60+
<Reference Include="Castle.Windsor, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
61+
<HintPath>..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
62+
<Private>True</Private>
63+
</Reference>
64+
<Reference Include="EPiServer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
65+
<HintPath>..\packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.dll</HintPath>
66+
<Private>True</Private>
67+
</Reference>
68+
<Reference Include="EPiServer.ApplicationModules, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
69+
<HintPath>..\packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.ApplicationModules.dll</HintPath>
70+
<Private>True</Private>
71+
</Reference>
72+
<Reference Include="EPiServer.Configuration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
73+
<HintPath>..\packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.Configuration.dll</HintPath>
74+
<Private>True</Private>
75+
</Reference>
76+
<Reference Include="EPiServer.Data, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
77+
<HintPath>..\packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Data.dll</HintPath>
78+
<Private>True</Private>
79+
</Reference>
80+
<Reference Include="EPiServer.Data.Cache, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
81+
<HintPath>..\packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Data.Cache.dll</HintPath>
82+
<Private>True</Private>
83+
</Reference>
84+
<Reference Include="EPiServer.Enterprise, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
85+
<HintPath>..\packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.Enterprise.dll</HintPath>
86+
<Private>True</Private>
87+
</Reference>
88+
<Reference Include="EPiServer.Events, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
89+
<HintPath>..\packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Events.dll</HintPath>
90+
<Private>True</Private>
91+
</Reference>
92+
<Reference Include="EPiServer.Framework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
93+
<HintPath>..\packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Framework.dll</HintPath>
94+
<Private>True</Private>
95+
</Reference>
96+
<Reference Include="EPiServer.ImageLibrary, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
97+
<HintPath>..\packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.ImageLibrary.dll</HintPath>
98+
<Private>True</Private>
99+
</Reference>
100+
<Reference Include="EPiServer.Licensing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
101+
<HintPath>..\packages\EPiServer.Framework.10.0.0\lib\net45\EPiServer.Licensing.dll</HintPath>
102+
<Private>True</Private>
103+
</Reference>
104+
<Reference Include="EPiServer.LinkAnalyzer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
105+
<HintPath>..\packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.LinkAnalyzer.dll</HintPath>
106+
<Private>True</Private>
107+
</Reference>
108+
<Reference Include="EPiServer.Web.WebControls, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
109+
<HintPath>..\packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.Web.WebControls.dll</HintPath>
56110
<Private>True</Private>
57111
</Reference>
58-
<Reference Include="EPiServer.Framework, Version=9.0.3.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
59-
<HintPath>..\packages\EPiServer.Framework.9.0.3\lib\net45\EPiServer.Framework.dll</HintPath>
112+
<Reference Include="EPiServer.XForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
113+
<HintPath>..\packages\EPiServer.CMS.Core.10.0.0\lib\net45\EPiServer.XForms.dll</HintPath>
60114
<Private>True</Private>
61115
</Reference>
62-
<Reference Include="Newtonsoft.Json">
63-
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
116+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
117+
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
64118
<Private>True</Private>
65119
</Reference>
66120
<Reference Include="System" />
67121
<Reference Include="System.configuration" />
68122
<Reference Include="System.Core" />
69123
<Reference Include="System.Web" />
124+
<Reference Include="System.Xml" />
70125
</ItemGroup>
71126
<ItemGroup>
72127
<Compile Include="AlchemyExtractionService.cs" />
@@ -99,10 +154,8 @@
99154
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
100155
</PropertyGroup>
101156
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
102-
<Error Condition="!Exists('..\packages\GitVersionTask.3.1.2\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.1.2\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets'))" />
103157
</Target>
104-
<Import Project="..\packages\GitVersionTask.3.1.2\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.1.2\Build\portable-net+sl+win+wpa+wp\GitVersionTask.targets')" />
105-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
158+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
106159
Other similar extension points exist, see Microsoft.Common.targets.
107160
<Target Name="BeforeBuild">
108161
</Target>

‎EPi.Libraries.Keywords.Alchemy/EPi.Libraries.Keywords.Alchemy.nuspec‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010
<iconUrl>http://jstemerdink.net/images/js-nuget.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>$description$</description>
13-
<releaseNotes>Updated for EPiServer 9</releaseNotes>
14-
<copyright>Copyright © Jeroen Stemerdink 2015</copyright>
13+
<releaseNotes>Updated for EPiServer 10</releaseNotes>
14+
<copyright>Copyright © Jeroen Stemerdink 2016</copyright>
1515
<tags>seo keywords translate alchemy</tags>
1616
<dependencies>
17-
<dependency id="EPiServer.CMS.Core" version="[9.0.3, 10.0)" />
18-
<dependency id="EPi.Libraries.Keywords" version="3.0.0.0" />
17+
<dependency id="EPi.Libraries.Keywords" version="4.0.0" />
1918
</dependencies>
2019
</metadata>
2120
<files>

‎EPi.Libraries.Keywords.Alchemy/Models/AlchemyResponse.cs‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright© 2014 Jeroen Stemerdink. All Rights Reserved.
2-
//
1+
// Copyright © 2016 Jeroen Stemerdink.
32
// Permission is hereby granted, free of charge, to any person
43
// obtaining a copy of this software and associated documentation
54
// files (the "Software"), to deal in the Software without
@@ -8,10 +7,8 @@
87
// copies of the Software, and to permit persons to whom the
98
// Software is furnished to do so, subject to the following
109
// conditions:
11-
//
1210
// The above copyright notice and this permission notice shall be
1311
// included in all copies or substantial portions of the Software.
14-
//
1512
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1613
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
1714
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -20,16 +17,13 @@
2017
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
2118
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
2219
// OTHER DEALINGS IN THE SOFTWARE.
23-
2420
namespace EPi.Libraries.Keywords.Alchemy.Models
2521
{
2622
/// <summary>
2723
/// Class AlchemyResponse.
2824
/// </summary>
2925
public class AlchemyResponse
3026
{
31-
#region Public Properties
32-
3327
/// <summary>
3428
/// Gets or sets the keywords.
3529
/// </summary>
@@ -59,7 +53,5 @@ public class AlchemyResponse
5953
/// </summary>
6054
/// <value>The URL.</value>
6155
public string url { get; set; }
62-
63-
#endregion
6456
}
6557
}

‎EPi.Libraries.Keywords.Alchemy/Models/Keyword.cs‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright© 2014 Jeroen Stemerdink. All Rights Reserved.
2-
//
1+
// Copyright © 2016 Jeroen Stemerdink.
32
// Permission is hereby granted, free of charge, to any person
43
// obtaining a copy of this software and associated documentation
54
// files (the "Software"), to deal in the Software without
@@ -8,10 +7,8 @@
87
// copies of the Software, and to permit persons to whom the
98
// Software is furnished to do so, subject to the following
109
// conditions:
11-
//
1210
// The above copyright notice and this permission notice shall be
1311
// included in all copies or substantial portions of the Software.
14-
//
1512
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1613
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
1714
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -20,16 +17,13 @@
2017
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
2118
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
2219
// OTHER DEALINGS IN THE SOFTWARE.
23-
2420
namespace EPi.Libraries.Keywords.Alchemy.Models
2521
{
2622
/// <summary>
2723
/// Class Keyword.
2824
/// </summary>
2925
public class Keyword
3026
{
31-
#region Public Properties
32-
3327
/// <summary>
3428
/// Gets or sets the relevance.
3529
/// </summary>
@@ -47,7 +41,5 @@ public class Keyword
4741
/// </summary>
4842
/// <value>The text.</value>
4943
public string text { get; set; }
50-
51-
#endregion
5244
}
5345
}

‎EPi.Libraries.Keywords.Alchemy/Models/Sentiment.cs‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Copyright© 2014 Jeroen Stemerdink. All Rights Reserved.
2-
//
1+
// Copyright © 2016 Jeroen Stemerdink.
32
// Permission is hereby granted, free of charge, to any person
43
// obtaining a copy of this software and associated documentation
54
// files (the "Software"), to deal in the Software without
@@ -8,10 +7,8 @@
87
// copies of the Software, and to permit persons to whom the
98
// Software is furnished to do so, subject to the following
109
// conditions:
11-
//
1210
// The above copyright notice and this permission notice shall be
1311
// included in all copies or substantial portions of the Software.
14-
//
1512
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1613
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
1714
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -20,16 +17,13 @@
2017
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
2118
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
2219
// OTHER DEALINGS IN THE SOFTWARE.
23-
2420
namespace EPi.Libraries.Keywords.Alchemy.Models
2521
{
2622
/// <summary>
2723
/// Class Sentiment.
2824
/// </summary>
2925
public class Sentiment
3026
{
31-
#region Public Properties
32-
3327
/// <summary>
3428
/// Gets or sets the mixed.
3529
/// </summary>
@@ -47,7 +41,5 @@ public class Sentiment
4741
/// </summary>
4842
/// <value>The type.</value>
4943
public string type { get; set; }
50-
51-
#endregion
5244
}
5345
}

‎EPi.Libraries.Keywords.Alchemy/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright© 2015 Jeroen Stemerdink. All Rights Reserved.
1+
// Copyright© 2016 Jeroen Stemerdink. All Rights Reserved.
22
//
33
// Permission is hereby granted, free of charge, to any person
44
// obtaining a copy of this software and associated documentation
@@ -34,7 +34,7 @@
3434
[assembly: AssemblyConfiguration("")]
3535
[assembly: AssemblyCompany("Jeroen Stemerdink")]
3636
[assembly: AssemblyProduct("EPi.Libraries.Keywords.Alchemy")]
37-
[assembly: AssemblyCopyright("Copyright © Jeroen Stemerdink 2015")]
37+
[assembly: AssemblyCopyright("Copyright © Jeroen Stemerdink 2016")]
3838
[assembly: AssemblyTrademark("")]
3939
[assembly: AssemblyCulture("")]
4040

0 commit comments

Comments
 (0)