Skip to content

Commit da12632

Browse files
mythzmythz
committed
merge SS.ServiceInterface into SS, only leave what requires optional OrmLite or Redis components
1 parent df3e296 commit da12632

273 files changed

Lines changed: 408 additions & 714 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.

‎src/ServiceStack.Api.Swagger/SwaggerApiService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public class ParameterAllowableValues
136136
}
137137

138138
[DefaultRequest(typeof(ResourceRequest))]
139-
public class SwaggerApiService : ServiceInterface.Service
139+
public class SwaggerApiService : Service
140140
{
141141
internal static bool UseCamelCaseModelPropertyNames { get; set; }
142142
internal static bool UseLowercaseUnderscoreModelPropertyNames { get; set; }

‎src/ServiceStack.Api.Swagger/SwaggerResourcesService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class RestService
3939
}
4040

4141
[DefaultRequest(typeof(Resources))]
42-
public class SwaggerResourcesService : ServiceInterface.Service
42+
public class SwaggerResourcesService : Service
4343
{
4444
private readonly Regex resourcePathCleanerRegex = new Regex(@"/[^\/\{]*", RegexOptions.Compiled);
4545
internal static Regex resourceFilterRegex;

‎src/ServiceStack.Authentication.OAuth2/OAuth2Provider.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Net;
5-
using System.Web;
65
using DotNetOpenAuth.Messaging;
76
using DotNetOpenAuth.OAuth2;
8-
9-
using ServiceStack.Common;
7+
using ServiceStack.Auth;
108
using ServiceStack.Configuration;
11-
using ServiceStack.ServiceInterface;
12-
using ServiceStack.ServiceInterface.Auth;
139
using ServiceStack.Text;
1410
using ServiceStack.Web;
1511
using ServiceStack.WebHost.Endpoints;

‎src/ServiceStack.Authentication.OpenId/OpenIdOAuthProvider.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66
using DotNetOpenAuth.OpenId.Extensions.AttributeExchange;
77
using DotNetOpenAuth.OpenId.Extensions.SimpleRegistration;
88
using DotNetOpenAuth.OpenId.RelyingParty;
9-
using ServiceStack.Common;
9+
using ServiceStack.Auth;
1010
using ServiceStack.Configuration;
1111
using ServiceStack.Server;
12-
using ServiceStack.ServiceHost;
13-
using ServiceStack.ServiceInterface;
14-
using ServiceStack.ServiceInterface.Auth;
1512
using ServiceStack.Text;
1613
using ServiceStack.Web;
1714

‎src/ServiceStack.Mvc/ExecuteServiceStackFiltersAttribute.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
using System.Linq;
44
using System.Web;
55
using System.Web.Mvc;
6-
using ServiceStack.ServiceInterface;
7-
using ServiceStack.ServiceInterface.Auth;
6+
using ServiceStack.Auth;
87

98
namespace ServiceStack.Mvc
109
{

‎src/ServiceStack.Mvc/ServiceStackController.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
using System.Web;
44
using System.Web.Mvc;
55
using System.Web.Routing;
6+
using ServiceStack.Auth;
67
using ServiceStack.Caching;
7-
using ServiceStack.ServiceInterface;
8-
using ServiceStack.ServiceInterface.Auth;
98
using ServiceStack.Text;
109

1110
namespace ServiceStack.Mvc

‎src/ServiceStack.Razor/ViewPageBase.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66
using System.IO;
77
using System.Text;
88
using System.Web;
9+
using ServiceStack.Auth;
910
using ServiceStack.Caching;
10-
using ServiceStack.Common;
1111
using ServiceStack.Data;
1212
using ServiceStack.Html;
1313
using ServiceStack.Messaging;
1414
using ServiceStack.MiniProfiler;
1515
using ServiceStack.Redis;
1616
using ServiceStack.Server;
17-
using ServiceStack.ServiceHost;
18-
using ServiceStack.ServiceInterface;
19-
using ServiceStack.ServiceInterface.Auth;
2017
using ServiceStack.Text;
2118
using ServiceStack.WebHost.Endpoints;
2219
using IHtmlString = System.Web.IHtmlString;

‎src/ServiceStack.ServiceInterface/Auth/OrmLiteAuthRepository.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Globalization;
55
using System.Linq;
66
using System.Text.RegularExpressions;
7+
using ServiceStack.Auth;
78
using ServiceStack.Data;
89
using ServiceStack.OrmLite;
910
using ServiceStack.Text;

‎src/ServiceStack.ServiceInterface/ServiceStack.ServiceInterface.csproj‎

Lines changed: 3 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@
7878
<Reference Include="ServiceStack.OrmLite">
7979
<HintPath>..\..\lib\ServiceStack.OrmLite.dll</HintPath>
8080
</Reference>
81+
<Reference Include="ServiceStack.Redis">
82+
<HintPath>..\..\lib\ServiceStack.Redis.dll</HintPath>
83+
</Reference>
8184
<Reference Include="ServiceStack.Text">
8285
<HintPath>..\..\lib\ServiceStack.Text.dll</HintPath>
8386
</Reference>
@@ -102,148 +105,8 @@
102105
<Reference Include="System.Xml" />
103106
</ItemGroup>
104107
<ItemGroup>
105-
<Compile Include="AddHeaderAttribute.cs" />
106-
<Compile Include="Admin\RequestLogsFeature.cs" />
107-
<Compile Include="ApplyTo.cs" />
108-
<Compile Include="AuthenticateAttribute.cs" />
109-
<Compile Include="AuthFeature.cs" />
110-
<Compile Include="Auth\AssignRolesService.cs" />
111-
<Compile Include="Auth\AuthenticateService.cs" />
112-
<Compile Include="Auth\BasicAuthProvider.cs" />
113-
<Compile Include="Auth\CredentialsAuthProvider.cs" />
114-
<Compile Include="Auth\DigestAuthProvider.cs" />
115-
<Compile Include="Auth\DigestAuthFunctions.cs" />
116-
<Compile Include="Auth\FacebookAuthProvider.cs" />
117-
<Compile Include="Auth\IAuthProvider.cs" />
118-
<Compile Include="Auth\InMemoryAuthRepository.cs" />
119-
<Compile Include="Auth\IAuthHttpGateway.cs" />
120-
<Compile Include="Auth\IAuthSession.cs" />
121-
<Compile Include="Auth\IOAuthTokens.cs" />
122-
<Compile Include="Auth\IRedisClientFacade.cs" />
123-
<Compile Include="Auth\IUserAuthRepository.cs" />
124-
<Compile Include="Auth\OAuthProvider.cs" />
125-
<Compile Include="Auth\TwitterAuthProvider.cs" />
126-
<Compile Include="Auth\UnAssignRolesService.cs" />
127-
<Compile Include="Auth\YammerAuthProvider.cs" />
128-
<Compile Include="Cors\EnableCors.cs" />
129-
<Compile Include="Cors\EnableCorsAttribute.cs" />
130-
<Compile Include="Cors\CorsFeature.cs" />
131-
<Compile Include="DefaultViewAttribute.cs" />
132-
<Compile Include="Providers\InMemoryRollingRequestLogger.cs" />
133-
<Compile Include="Admin\RequestLogsService.cs" />
134-
<Compile Include="RequiresAnyPermission.cs" />
135-
<Compile Include="RequiresAnyRoleAttribute.cs" />
136-
<Compile Include="RequiredRoleAttribute.cs" />
137-
<Compile Include="Auth\RegisterService.cs" />
138-
<Compile Include="Auth\OAuthAuthorizer.cs" />
139-
<Compile Include="Auth\AuthProvider.cs" />
140-
<Compile Include="Auth\AuthUserSession.cs" />
141108
<Compile Include="Auth\OrmLiteAuthRepository.cs" />
142-
<Compile Include="Auth\RedisAuthRepository.cs" />
143-
<Compile Include="Auth\SaltedHash.cs" />
144-
<Compile Include="Auth\UserAuth.cs" />
145-
<Compile Include="Config.cs" />
146-
<Compile Include="FluentValidation\AbstractValidator.cs" />
147-
<Compile Include="FluentValidation\AssemblyScanner.cs" />
148-
<Compile Include="FluentValidation\Attributes\AttributedValidatorFactory.cs" />
149-
<Compile Include="FluentValidation\Attributes\ValidatorAttribute.cs" />
150-
<Compile Include="FluentValidation\CollectionValidatorExtensions.cs" />
151-
<Compile Include="FluentValidation\DefaultValidatorExtensions.cs" />
152-
<Compile Include="FluentValidation\DefaultValidatorOptions.cs" />
153-
<Compile Include="FluentValidation\Enums.cs" />
154-
<Compile Include="FluentValidation\InlineValidator.cs" />
155-
<Compile Include="FluentValidation\Internal\DefaultValidatorSelector.cs" />
156-
<Compile Include="FluentValidation\Internal\DelegateValidator.cs" />
157-
<Compile Include="FluentValidation\Internal\Extensions.cs" />
158-
<Compile Include="FluentValidation\Internal\IConfigurable.cs" />
159-
<Compile Include="FluentValidation\Internal\IFluentInterface.cs" />
160-
<Compile Include="FluentValidation\Internal\InstanceCache.cs" />
161-
<Compile Include="FluentValidation\Internal\IValidatorSelector.cs" />
162-
<Compile Include="FluentValidation\Internal\MemberNameValidatorSelector.cs" />
163-
<Compile Include="FluentValidation\Internal\MessageFormatter.cs" />
164-
<Compile Include="FluentValidation\Internal\PropertyChain.cs" />
165-
<Compile Include="FluentValidation\Internal\PropertyRule.cs" />
166-
<Compile Include="FluentValidation\Internal\RuleBuilder.cs" />
167-
<Compile Include="FluentValidation\Internal\RulesetValidatorSelector.cs" />
168-
<Compile Include="FluentValidation\Internal\TrackingCollection.cs" />
169-
<Compile Include="FluentValidation\IValidationRule.cs" />
170-
<Compile Include="FluentValidation\IValidator.cs" />
171-
<Compile Include="FluentValidation\IValidatorDescriptor.cs" />
172-
<Compile Include="FluentValidation\IValidatorFactory.cs" />
173-
<Compile Include="FluentValidation\Resources\IResourceAccessorBuilder.cs" />
174-
<Compile Include="FluentValidation\Resources\IStringSource.cs" />
175-
<Compile Include="FluentValidation\Resources\LocalizedStringSource.cs" />
176-
<Compile Include="FluentValidation\Resources\Messages.Designer.cs" />
177-
<Compile Include="FluentValidation\Resources\StaticStringSource.cs" />
178-
<Compile Include="FluentValidation\Results\ValidationFailure.cs" />
179-
<Compile Include="FluentValidation\Results\ValidationResult.cs" />
180-
<Compile Include="FluentValidation\Syntax.cs" />
181-
<Compile Include="FluentValidation\TestHelper\ValidationTestException.cs" />
182-
<Compile Include="FluentValidation\TestHelper\ValidatorTester.cs" />
183-
<Compile Include="FluentValidation\TestHelper\ValidatorTestExtensions.cs" />
184-
<Compile Include="FluentValidation\ValidationContext.cs" />
185-
<Compile Include="FluentValidation\ValidationException.cs" />
186-
<Compile Include="FluentValidation\ValidatorDescriptor.cs" />
187-
<Compile Include="FluentValidation\ValidatorFactoryBase.cs" />
188-
<Compile Include="FluentValidation\ValidatorOptions.cs" />
189-
<Compile Include="FluentValidation\Validators\AbstractComparisonValidator.cs" />
190-
<Compile Include="FluentValidation\Validators\ChildCollectionValidatorAdaptor.cs" />
191-
<Compile Include="FluentValidation\Validators\ChildValidatorAdaptor.cs" />
192-
<Compile Include="FluentValidation\Validators\CreditCardValidator.cs" />
193-
<Compile Include="FluentValidation\Validators\DelegatingValidator.cs" />
194-
<Compile Include="FluentValidation\Validators\EmailValidator.cs" />
195-
<Compile Include="FluentValidation\Validators\EqualValidator.cs" />
196-
<Compile Include="FluentValidation\Validators\ExclusiveBetweenValidator.cs" />
197-
<Compile Include="FluentValidation\Validators\GreaterThanOrEqualValidator.cs" />
198-
<Compile Include="FluentValidation\Validators\GreaterThanValidator.cs" />
199-
<Compile Include="FluentValidation\Validators\InclusiveBetweenValidator.cs" />
200-
<Compile Include="FluentValidation\Validators\IPropertyValidator.cs" />
201-
<Compile Include="FluentValidation\Validators\LengthValidator.cs" />
202-
<Compile Include="FluentValidation\Validators\LessThanOrEqualValidator.cs" />
203-
<Compile Include="FluentValidation\Validators\LessThanValidator.cs" />
204-
<Compile Include="FluentValidation\Validators\NoopPropertyValidator.cs" />
205-
<Compile Include="FluentValidation\Validators\NotEmptyValidator.cs" />
206-
<Compile Include="FluentValidation\Validators\NotEqualValidator.cs" />
207-
<Compile Include="FluentValidation\Validators\NotNullValidator.cs" />
208-
<Compile Include="FluentValidation\Validators\PredicateValidator.cs" />
209-
<Compile Include="FluentValidation\Validators\PropertyValidator.cs" />
210-
<Compile Include="FluentValidation\Validators\PropertyValidatorContext.cs" />
211-
<Compile Include="FluentValidation\Validators\RegularExpressionValidator.cs" />
212-
<Compile Include="IServiceBase.cs" />
213-
<Compile Include="RegistrationFeature.cs" />
214-
<Compile Include="RequestFilterAttribute.cs" />
215-
<Compile Include="RequiredPermissionAttribute.cs" />
216-
<Compile Include="ResponseFilterAttribute.cs" />
217-
<Compile Include="RoleNames.cs" />
218-
<Compile Include="Service.cs" />
219-
<Compile Include="ServiceExtensions.cs" />
220109
<Compile Include="Properties\AssemblyInfo.cs" />
221-
<Compile Include="ServiceResponseException.cs" />
222-
<Compile Include="ServiceRoutesExtensions.cs" />
223-
<Compile Include="SessionFactory.cs" />
224-
<Compile Include="SessionExtensions.cs" />
225-
<Compile Include="SessionFeature.cs" />
226-
<Compile Include="SetStatusAttribute.cs" />
227-
<Compile Include="SuppressFormsAuthenticationRedirectModule.cs" />
228-
<Compile Include="Testing\BasicAppHost.cs" />
229-
<Compile Include="Testing\BasicResolver.cs" />
230-
<Compile Include="Testing\MockHttpRequest.cs">
231-
<SubType>Code</SubType>
232-
</Compile>
233-
<Compile Include="Testing\MockHttpResponse.cs" />
234-
<Compile Include="Testing\MockRequestContext.cs" />
235-
<Compile Include="Testing\TestAppHost.cs" />
236-
<Compile Include="Testing\TestBase.cs">
237-
<SubType>Code</SubType>
238-
</Compile>
239-
<Compile Include="ClientCanSwapTemplatesAttribute.cs" />
240-
<Compile Include="Validation\ExecOnlyOnce.cs" />
241-
<Compile Include="Validation\MultiRuleSetValidatorSelector.cs" />
242-
<Compile Include="FluentValidation\ValidationErrors.cs" />
243-
<Compile Include="Validation\ValidationFilters.cs" />
244-
<Compile Include="Validation\ValidationFeature.cs" />
245-
<Compile Include="ValidationResultExtensions.cs" />
246-
<Compile Include="Validation\ValidatorCache.cs" />
247110
</ItemGroup>
248111
<ItemGroup>
249112
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -277,9 +140,6 @@
277140
</ProjectReference>
278141
</ItemGroup>
279142
<ItemGroup />
280-
<ItemGroup>
281-
<EmbeddedResource Include="FluentValidation\Resources\Messages.resx" />
282-
</ItemGroup>
283143
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
284144
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
285145
Other similar extension points exist, see Microsoft.Common.targets.

src/ServiceStack.ServiceInterface/AddHeaderAttribute.cs renamed to src/ServiceStack/AddHeaderAttribute.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
using System;
22
using System.Net;
33
using ServiceStack.Server;
4-
using ServiceStack.ServiceHost;
54
using ServiceStack.Web;
65

7-
namespace ServiceStack.ServiceInterface
6+
namespace ServiceStack
87
{
98
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)]
109
public class AddHeaderAttribute : RequestFilterAttribute

0 commit comments

Comments
 (0)