Skip to content

Commit 64d79a8

Browse files
rxturrxtur
committed
Rearranging things in Core
1 parent 96668e8 commit 64d79a8

62 files changed

Lines changed: 61 additions & 62 deletions

Some content is hidden

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

‎BlogEngine/BlogEngine.Core/BlogEngine.Core.csproj‎

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@
119119
<Reference Include="System.Xml" />
120120
</ItemGroup>
121121
<ItemGroup>
122-
<Compile Include="API\BlogML\BaseReader.cs" />
123-
<Compile Include="API\BlogML\BlogImporter.cs" />
124-
<Compile Include="API\BlogML\BlogMLExtendedPost.cs" />
125-
<Compile Include="API\BlogML\BlogReader.cs" />
122+
<Compile Include="Services\Syndication\BlogML\BaseReader.cs" />
123+
<Compile Include="Services\Syndication\BlogML\BlogImporter.cs" />
124+
<Compile Include="Services\Syndication\BlogML\BlogMLExtendedPost.cs" />
125+
<Compile Include="Services\Syndication\BlogML\BlogReader.cs" />
126126
<Compile Include="API\MetaWeblog\MetaWeblogException.cs" />
127127
<Compile Include="API\MetaWeblog\MetaWeblogHandler.cs" />
128128
<Compile Include="API\MetaWeblog\MWAAuthor.cs" />
@@ -138,20 +138,20 @@
138138
<Compile Include="API\MetaWeblog\XMLRPCResponse.cs" />
139139
<Compile Include="Blog.cs" />
140140
<Compile Include="BlogConfig.cs" />
141-
<Compile Include="BlogGenerator.cs" />
142-
<Compile Include="BlogGeneratorConfig.cs" />
141+
<Compile Include="Helpers\BlogGenerator.cs" />
142+
<Compile Include="Helpers\BlogGeneratorConfig.cs" />
143143
<Compile Include="Category.cs" />
144-
<Compile Include="Compilation\BaseServerObjectExpressionBuilder.cs" />
145-
<Compile Include="Compilation\CodeExpressionBuilder.cs" />
146-
<Compile Include="Compilation\Design\CodeExpressionEditor.cs" />
147-
<Compile Include="Compilation\Design\QueryStringExpressionEditor.cs" />
148-
<Compile Include="Compilation\Design\ServerVariableExpressionEditor.cs" />
149-
<Compile Include="Compilation\Design\SessionExpressionEditor.cs" />
150-
<Compile Include="Compilation\LinqLengthExpressionBuilder.cs" />
151-
<Compile Include="Compilation\QueryStringExpressionBuilder.cs" />
152-
<Compile Include="Compilation\ReflectExpressionBuilder.cs" />
153-
<Compile Include="Compilation\ServerVariableExpressionBuilder.cs" />
154-
<Compile Include="Compilation\SessionExpressionBuilder.cs" />
144+
<Compile Include="Services\Compilation\BaseServerObjectExpressionBuilder.cs" />
145+
<Compile Include="Services\Compilation\CodeExpressionBuilder.cs" />
146+
<Compile Include="Services\Compilation\Design\CodeExpressionEditor.cs" />
147+
<Compile Include="Services\Compilation\Design\QueryStringExpressionEditor.cs" />
148+
<Compile Include="Services\Compilation\Design\ServerVariableExpressionEditor.cs" />
149+
<Compile Include="Services\Compilation\Design\SessionExpressionEditor.cs" />
150+
<Compile Include="Services\Compilation\LinqLengthExpressionBuilder.cs" />
151+
<Compile Include="Services\Compilation\QueryStringExpressionBuilder.cs" />
152+
<Compile Include="Services\Compilation\ReflectExpressionBuilder.cs" />
153+
<Compile Include="Services\Compilation\ServerVariableExpressionBuilder.cs" />
154+
<Compile Include="Services\Compilation\SessionExpressionBuilder.cs" />
155155
<Compile Include="Data\CommentFilterRepository.cs" />
156156
<Compile Include="Data\Contracts\ICommentFilterRepository.cs" />
157157
<Compile Include="Data\Contracts\ICustomFieldRepository.cs" />
@@ -214,30 +214,30 @@
214214
<Compile Include="Data\TagRepository.cs" />
215215
<Compile Include="Data\TrashRepository.cs" />
216216
<Compile Include="Extensions.cs" />
217-
<Compile Include="FileSystem\Common.cs" />
218-
<Compile Include="FileSystem\Directory.cs" />
219-
<Compile Include="FileSystem\File.cs" />
220-
<Compile Include="FileSystem\FileStoreDb.cs" />
221-
<Compile Include="FileSystem\Image.cs" />
222-
<Compile Include="FileSystem\FileSystemUtilities.cs" />
217+
<Compile Include="Services\FileSystem\Common.cs" />
218+
<Compile Include="Services\FileSystem\Directory.cs" />
219+
<Compile Include="Services\FileSystem\File.cs" />
220+
<Compile Include="Services\FileSystem\FileStoreDb.cs" />
221+
<Compile Include="Services\FileSystem\Image.cs" />
222+
<Compile Include="Services\FileSystem\FileSystemUtilities.cs" />
223223
<Compile Include="Data\Models\Settings.cs" />
224-
<Compile Include="Notes\QuickNote.cs" />
225-
<Compile Include="Notes\QuickNotes.cs" />
226-
<Compile Include="Notes\QuickSetting.cs" />
227-
<Compile Include="Notes\QuickSettings.cs" />
228-
<Compile Include="Packaging\Constants.cs" />
229-
<Compile Include="Packaging\GalleryData.cs" />
230-
<Compile Include="Packaging\FileSystem.cs" />
231-
<Compile Include="Packaging\Gallery.cs" />
232-
<Compile Include="Packaging\InstalledPackage.cs" />
233-
<Compile Include="Packaging\Installer.cs" />
234-
<Compile Include="Packaging\PackageFile.cs" />
235-
<Compile Include="Packaging\PackagingSource.cs" />
236-
<Compile Include="Packaging\Pager.cs" />
224+
<Compile Include="Services\Notes\QuickNote.cs" />
225+
<Compile Include="Services\Notes\QuickNotes.cs" />
226+
<Compile Include="Services\Notes\QuickSetting.cs" />
227+
<Compile Include="Services\Notes\QuickSettings.cs" />
228+
<Compile Include="Services\Packaging\Constants.cs" />
229+
<Compile Include="Services\Packaging\GalleryData.cs" />
230+
<Compile Include="Services\Packaging\FileSystem.cs" />
231+
<Compile Include="Services\Packaging\Gallery.cs" />
232+
<Compile Include="Services\Packaging\InstalledPackage.cs" />
233+
<Compile Include="Services\Packaging\Installer.cs" />
234+
<Compile Include="Services\Packaging\PackageFile.cs" />
235+
<Compile Include="Services\Packaging\PackagingSource.cs" />
236+
<Compile Include="Services\Packaging\Pager.cs" />
237237
<Compile Include="Pager.cs" />
238-
<Compile Include="Ping\Manager.cs" />
239-
<Compile Include="Ping\Trackback.cs" />
240-
<Compile Include="Ping\TrackbackMessage.cs" />
238+
<Compile Include="Services\Ping\Manager.cs" />
239+
<Compile Include="Services\Ping\Trackback.cs" />
240+
<Compile Include="Services\Ping\TrackbackMessage.cs" />
241241
<Compile Include="Providers\FileSystemProviders\BlogFileSystemProvider.cs" />
242242
<Compile Include="Providers\FileSystemProviders\BlogFileSystemProviderCollection.cs" />
243243
<Compile Include="Providers\FileSystemProviders\BlogFileSystemProviderSection.cs" />
@@ -254,22 +254,22 @@
254254
<Compile Include="Providers\XmlProvider\Rights.cs" />
255255
<Compile Include="Providers\FileSystemProviders\XmlFileSystemProvider.cs" />
256256
<Compile Include="RemoteFile.cs" />
257-
<Compile Include="Security\CustomIdentity.cs" />
258-
<Compile Include="Security\CustomPrincipal.cs" />
259-
<Compile Include="Security\Right.cs" />
260-
<Compile Include="Security\Rights.cs" />
261-
<Compile Include="Security\Security.cs" />
262-
<Compile Include="Security\SecuritySiteMapProvider.cs" />
257+
<Compile Include="Services\Security\CustomIdentity.cs" />
258+
<Compile Include="Services\Security\CustomPrincipal.cs" />
259+
<Compile Include="Services\Security\Right.cs" />
260+
<Compile Include="Services\Security\Rights.cs" />
261+
<Compile Include="Services\Security\Security.cs" />
262+
<Compile Include="Services\Security\SecuritySiteMapProvider.cs" />
263263
<Compile Include="Service References\GalleryServer\Reference.cs">
264264
<AutoGen>True</AutoGen>
265265
<DesignTime>True</DesignTime>
266266
<DependentUpon>Reference.datasvcmap</DependentUpon>
267267
</Compile>
268-
<Compile Include="ServingEventArgs.cs" />
268+
<Compile Include="Helpers\ServingEventArgs.cs" />
269269
<Compile Include="Providers\XmlProvider\PingServices.cs" />
270-
<Compile Include="SavedEventArgs.cs" />
271-
<Compile Include="Search.cs" />
272-
<Compile Include="SyndicationFormat.cs" />
270+
<Compile Include="Helpers\SavedEventArgs.cs" />
271+
<Compile Include="Services\Search\Search.cs" />
272+
<Compile Include="Services\Syndication\SyndicationFormat.cs" />
273273
<Compile Include="Web\BlogCulture.cs" />
274274
<Compile Include="Web\Controls\ExtensionAttribute.cs" />
275275
<Compile Include="Web\Controls\CommentViewBase.cs">
@@ -308,12 +308,12 @@
308308
<SubType>ASPXCodeBehind</SubType>
309309
</Compile>
310310
<Compile Include="Page.cs" />
311-
<Compile Include="Ping\Pingback.cs" />
312-
<Compile Include="Ping\PingService.cs" />
311+
<Compile Include="Services\Ping\Pingback.cs" />
312+
<Compile Include="Services\Ping\PingService.cs" />
313313
<Compile Include="Post.cs" />
314314
<Compile Include="Properties\AssemblyInfo.cs" />
315-
<Compile Include="StateCollection.cs" />
316-
<Compile Include="Utils.cs" />
315+
<Compile Include="Helpers\StateCollection.cs" />
316+
<Compile Include="Helpers\Utils.cs" />
317317
<Compile Include="Providers\XmlProvider\XmlMembershipProvider.cs" />
318318
<Compile Include="Web\HttpHandlers\SyndicationHandler.cs" />
319319
<Compile Include="Web\HttpHandlers\TrackbackHandler.cs" />
@@ -328,11 +328,11 @@
328328
<Compile Include="Web\Scripting\JavascriptMinifier.cs" />
329329
<Compile Include="Web\Scripting\WebResourceFilter.cs" />
330330
<Compile Include="Web\UrlRules.cs" />
331-
<Compile Include="XmlSafeResolver.cs" />
331+
<Compile Include="Helpers\XmlSafeResolver.cs" />
332332
</ItemGroup>
333333
<ItemGroup>
334334
<Compile Include="BlogRollItem.cs" />
335-
<Compile Include="CommentHandlers.cs" />
335+
<Compile Include="Services\Messaging\CommentHandlers.cs" />
336336
<Compile Include="DataStore\ExtensionSettings.cs" />
337337
<Compile Include="DataStore\ExtensionSettingsBehavior.cs" />
338338
<Compile Include="DataStore\Interfaces.cs" />
@@ -341,7 +341,7 @@
341341
<Compile Include="DataStore\StringDictionaryBehavior.cs" />
342342
<Compile Include="DataStore\WidgetSettings.cs" />
343343
<Compile Include="DataStore\XMLDocumentBehavior.cs" />
344-
<Compile Include="ICustomFilter.cs" />
344+
<Compile Include="Services\Messaging\ICustomFilter.cs" />
345345
<Compile Include="IPublishable.cs" />
346346
<Compile Include="Providers\DbProvider\DbBlogProvider.cs" />
347347
<Compile Include="Providers\DbProvider\DbMembershipProvider.cs" />
@@ -358,7 +358,7 @@
358358
<Compile Include="Providers\XmlProvider\XmlRoleProvider.cs" />
359359
<Compile Include="Referrer.cs" />
360360
<Compile Include="Role.cs" />
361-
<Compile Include="SyndicationGenerator.cs" />
361+
<Compile Include="Services\Syndication\SyndicationGenerator.cs" />
362362
<Compile Include="AuthorProfile.cs" />
363363
<Compile Include="Web\Controls\RewriteFormHtmlTextWriter.cs" />
364364
<Compile Include="Web\Extensions\ExtensionManager.cs" />
@@ -393,7 +393,6 @@
393393
<ItemGroup>
394394
<None Include="key.snk" />
395395
<None Include="packages.config" />
396-
<None Include="Ping\Ping.cd" />
397396
<None Include="Service References\GalleryServer\service.edmx" />
398397
</ItemGroup>
399398
<ItemGroup>

BlogEngine/BlogEngine.Core/BlogGenerator.cs renamed to BlogEngine/BlogEngine.Core/Helpers/BlogGenerator.cs

File renamed without changes.

BlogEngine/BlogEngine.Core/BlogGeneratorConfig.cs renamed to BlogEngine/BlogEngine.Core/Helpers/BlogGeneratorConfig.cs

File renamed without changes.

BlogEngine/BlogEngine.Core/SavedEventArgs.cs renamed to BlogEngine/BlogEngine.Core/Helpers/SavedEventArgs.cs

File renamed without changes.

BlogEngine/BlogEngine.Core/ServingEventArgs.cs renamed to BlogEngine/BlogEngine.Core/Helpers/ServingEventArgs.cs

File renamed without changes.

BlogEngine/BlogEngine.Core/StateCollection.cs renamed to BlogEngine/BlogEngine.Core/Helpers/StateCollection.cs

File renamed without changes.

BlogEngine/BlogEngine.Core/Utils.cs renamed to BlogEngine/BlogEngine.Core/Helpers/Utils.cs

File renamed without changes.

BlogEngine/BlogEngine.Core/XmlSafeResolver.cs renamed to BlogEngine/BlogEngine.Core/Helpers/XmlSafeResolver.cs

File renamed without changes.

‎BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
[assembly: CLSCompliant(false)]
2020
[assembly: ComVisible(false)]
2121
[assembly: AllowPartiallyTrustedCallers]
22-
[assembly: AssemblyVersion("3.1.2.0")]
22+
[assembly: AssemblyVersion("3.1.2.1")]
2323
[assembly: SecurityRules(SecurityRuleSet.Level1)]

BlogEngine/BlogEngine.Core/Compilation/BaseServerObjectExpressionBuilder.cs renamed to BlogEngine/BlogEngine.Core/Services/Compilation/BaseServerObjectExpressionBuilder.cs

File renamed without changes.

0 commit comments

Comments
 (0)