diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Module.txt b/src/Orchard.Web/Modules/Futures.Modules.Packaging/Module.txt
deleted file mode 100644
index b516c0b3b..000000000
--- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Module.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Futures.Modules.Packaging
-antiforgery: enabled
-author: The Orchard Team
-website: http://orchardproject.net
-version: 0.5.0
-orchardversion: 0.5.0
-description: The packaging module enables packaging modules using the OPC format.
-features:
- Futures.Modules.Packaging:
- Description: Standard module and feature management.
- Category: Developer
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
index 431efd0be..8e5e36cd7 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
@@ -6,6 +6,7 @@ using Orchard.Localization;
using Orchard.Modules.ViewModels;
using Orchard.Mvc.Results;
using Orchard.Packaging;
+using Orchard.Packaging.Services;
using Orchard.Reports.Services;
using Orchard.UI.Notify;
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Module.txt b/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
index 67f444b75..97ad9b5aa 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Module.txt
@@ -8,4 +8,5 @@ description: The Modules module enables the administrator of the site to manage
features:
Orchard.Modules:
Description: Standard module and feature management.
+ Dependencies: PackagingServices
Category: Core
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
index e0824a43b..8d4e95be6 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
@@ -66,7 +66,6 @@
-
@@ -90,6 +89,10 @@
{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}
Orchard.Framework
+
+ {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}
+ Orchard.Packaging
+
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
similarity index 61%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/AdminMenu.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
index 4dbc28ee3..7de2ef405 100644
--- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/AdminMenu.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
@@ -1,7 +1,9 @@
-using Orchard.Localization;
+using Orchard.Environment.Extensions;
+using Orchard.Localization;
using Orchard.UI.Navigation;
-namespace Futures.Modules.Packaging {
+namespace Orchard.Packaging {
+ [OrchardFeature("Gallery")]
public class AdminMenu : INavigationProvider {
public Localizer T { get; set; }
@@ -9,8 +11,8 @@ namespace Futures.Modules.Packaging {
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Site Configuration"), "11", menu => menu
- .Add(T("Module Packaging"), "5.0", item => item
- .Action("Index", "Packaging", new { area = "Futures.Modules.Packaging" })));
+ .Add(T("Gallery"), "5.0", item => item
+ .Action("Index", "Packaging", new { area = "Orchard.Packaging" })));
}
}
}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Commands/PackagingCommands.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Commands/GalleryCommands.cs
similarity index 87%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/Commands/PackagingCommands.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Commands/GalleryCommands.cs
index 29aa5f1e4..aa4be10be 100644
--- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Commands/PackagingCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Commands/GalleryCommands.cs
@@ -2,13 +2,13 @@ using System;
using System.IO;
using System.Net;
using Orchard.Commands;
-using Orchard.Packaging;
+using Orchard.Packaging.Services;
-namespace Futures.Modules.Packaging.Commands {
- public class PackagingCommands : DefaultOrchardCommandHandler {
+namespace Orchard.Packaging.Commands {
+ public class GalleryCommands : DefaultOrchardCommandHandler {
private readonly IPackageManager _packageManager;
- public PackagingCommands(IPackageManager packageManager) {
+ public GalleryCommands(IPackageManager packageManager) {
_packageManager = packageManager;
}
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Commands/PackagingCommands.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Commands/PackagingCommands.cs
similarity index 82%
rename from src/Orchard.Web/Modules/Orchard.Modules/Commands/PackagingCommands.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Commands/PackagingCommands.cs
index 417d8f350..5b28a7cff 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Commands/PackagingCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Commands/PackagingCommands.cs
@@ -1,17 +1,14 @@
using System.IO;
using Orchard.Commands;
-using Orchard.Packaging;
-using Orchard.UI.Notify;
+using Orchard.Environment.Extensions;
+using Orchard.Packaging.Services;
-namespace Orchard.Modules.Commands {
+namespace Orchard.Packaging.Commands {
+ [OrchardFeature("Packaging")]
public class PackagingCommands : DefaultOrchardCommandHandler {
- private readonly IModuleService _moduleService;
- private readonly INotifier _notifier;
private readonly IPackageManager _packageManager;
- public PackagingCommands(IModuleService moduleService, INotifier notifier, IPackageManager packageManager) {
- _moduleService = moduleService;
- _notifier = notifier;
+ public PackagingCommands(IPackageManager packageManager) {
_packageManager = packageManager;
}
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Controllers/DownloadStreamResult.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/DownloadStreamResult.cs
similarity index 92%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/Controllers/DownloadStreamResult.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Controllers/DownloadStreamResult.cs
index 0ff300fa4..c1a8fb3ca 100644
--- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Controllers/DownloadStreamResult.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/DownloadStreamResult.cs
@@ -1,7 +1,7 @@
using System.IO;
using System.Web.Mvc;
-namespace Futures.Modules.Packaging.Controllers {
+namespace Orchard.Packaging.Controllers {
public class DownloadStreamResult : ActionResult {
public string FileName { get; set; }
public string ContentType { get; set; }
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Controllers/PackagingController.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingController.cs
similarity index 93%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/Controllers/PackagingController.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingController.cs
index d4d4ab920..854304ee3 100644
--- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Controllers/PackagingController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingController.cs
@@ -1,15 +1,16 @@
using System;
using System.Linq;
using System.Web.Mvc;
-using Futures.Modules.Packaging.ViewModels;
using Orchard.Environment.Extensions;
using Orchard.Localization;
-using Orchard.Packaging;
+using Orchard.Packaging.Services;
+using Orchard.Packaging.ViewModels;
using Orchard.Themes;
using Orchard.UI.Admin;
using Orchard.UI.Notify;
-namespace Futures.Modules.Packaging.Controllers {
+namespace Orchard.Packaging.Controllers {
+ [OrchardFeature("Gallery")]
[Themed, Admin]
public class PackagingController : Controller {
private readonly IPackageManager _packageManager;
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt b/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt
new file mode 100644
index 000000000..453d51f4c
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Module.txt
@@ -0,0 +1,19 @@
+name: Packaging
+antiforgery: enabled
+author: The Orchard Team
+website: http://orchardproject.net
+version: 0.5.0
+orchardversion: 0.5.0
+description: The packaging module enables packaging modules using the OPC format.
+features:
+ PackagingServices:
+ Description: Core services for packaging using the OPC format.
+ Category: Core
+ Orchard.Packaging:
+ Description: Commands for creating/installing local modules.
+ Dependencies: PackagingServices
+ Category: Packaging
+ Gallery:
+ Description: Module gallery management.
+ Dependencies: PackagingServices
+ Category: Packaging
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Futures.Modules.Packaging.csproj b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
similarity index 84%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/Futures.Modules.Packaging.csproj
rename to src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
index 7653cf843..3f9372ad1 100644
--- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Futures.Modules.Packaging.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
@@ -10,8 +10,8 @@
{F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}
Library
Properties
- Futures.Modules.Packaging
- Futures.Modules.Packaging
+ Orchard.Packaging
+ Orchard.Packaging
v4.0
false
@@ -37,6 +37,7 @@
+
@@ -63,12 +64,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs
similarity index 89%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/Properties/AssemblyInfo.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs
index 6e57cd926..4774c5ede 100644
--- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("Futures.Modules.Packaging")]
+[assembly: AssemblyTitle("Orchard.Packaging")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Futures.Modules.Packaging")]
+[assembly: AssemblyProduct("Orchard")]
[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/src/Orchard/Packaging/AtomExtensions.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/AtomExtensions.cs
similarity index 56%
rename from src/Orchard/Packaging/AtomExtensions.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Services/AtomExtensions.cs
index 235c634c1..f2d24ae6d 100644
--- a/src/Orchard/Packaging/AtomExtensions.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/AtomExtensions.cs
@@ -1,9 +1,11 @@
using System.Xml.Linq;
+using Orchard.Environment.Extensions;
-namespace Orchard.Packaging {
- static class AtomExtensions {
+namespace Orchard.Packaging.Services {
+ [OrchardFeature("PackagingServices")]
+ internal static class AtomExtensions {
public static string Atom(this XElement entry, string localName) {
- var element = entry.Element(AtomXName(localName));
+ XElement element = entry.Element(AtomXName(localName));
return element != null ? element.Value : null;
}
diff --git a/src/Orchard/Packaging/IPackageBuilder.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/IPackageBuilder.cs
similarity index 69%
rename from src/Orchard/Packaging/IPackageBuilder.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Services/IPackageBuilder.cs
index ff2a13bec..1f24f473a 100644
--- a/src/Orchard/Packaging/IPackageBuilder.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/IPackageBuilder.cs
@@ -1,7 +1,8 @@
using System.IO;
+using Orchard.Environment.Extensions;
using Orchard.Environment.Extensions.Models;
-namespace Orchard.Packaging {
+namespace Orchard.Packaging.Services {
public interface IPackageBuilder : IDependency {
Stream BuildPackage(ExtensionDescriptor extensionDescriptor);
}
diff --git a/src/Orchard/Packaging/IPackageExpander.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/IPackageExpander.cs
similarity index 80%
rename from src/Orchard/Packaging/IPackageExpander.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Services/IPackageExpander.cs
index 090dae415..6735e8b26 100644
--- a/src/Orchard/Packaging/IPackageExpander.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/IPackageExpander.cs
@@ -1,7 +1,7 @@
-using System;
using System.IO;
+using Orchard.Environment.Extensions;
-namespace Orchard.Packaging {
+namespace Orchard.Packaging.Services {
public class PackageInfo {
public string ExtensionName { get; set; }
public string ExtensionVersion { get; set; }
diff --git a/src/Orchard/Packaging/IPackageManager.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/IPackageManager.cs
similarity index 85%
rename from src/Orchard/Packaging/IPackageManager.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Services/IPackageManager.cs
index 87c302725..5538f9c30 100644
--- a/src/Orchard/Packaging/IPackageManager.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/IPackageManager.cs
@@ -1,6 +1,6 @@
using System.IO;
-namespace Orchard.Packaging {
+namespace Orchard.Packaging.Services {
public interface IPackageManager : IDependency {
PackageData Harvest(string extensionName);
PackageData Download(string feedItemId);
diff --git a/src/Orchard/Packaging/IPackagingSourceManager.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/IPackagingSourceManager.cs
similarity index 86%
rename from src/Orchard/Packaging/IPackagingSourceManager.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Services/IPackagingSourceManager.cs
index c5e9bc52f..5f5528630 100644
--- a/src/Orchard/Packaging/IPackagingSourceManager.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/IPackagingSourceManager.cs
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
-namespace Orchard.Packaging {
+namespace Orchard.Packaging.Services {
public interface IPackagingSourceManager : IDependency {
IEnumerable GetSources();
void AddSource(PackagingSource source);
diff --git a/src/Orchard/Packaging/PackageBuilder.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageBuilder.cs
similarity index 72%
rename from src/Orchard/Packaging/PackageBuilder.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageBuilder.cs
index 6265c41f9..64fb2499c 100644
--- a/src/Orchard/Packaging/PackageBuilder.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageBuilder.cs
@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Collections.Generic;
using System.IO;
using System.IO.Packaging;
using System.Linq;
@@ -9,7 +10,8 @@ using Orchard.Environment.Extensions;
using Orchard.Environment.Extensions.Models;
using Orchard.FileSystems.WebSite;
-namespace Orchard.Packaging {
+namespace Orchard.Packaging.Services {
+ [OrchardFeature("PackagingServices")]
public class PackageBuilder : IPackageBuilder {
private readonly IExtensionManager _extensionManager;
private readonly IWebSiteFolder _webSiteFolder;
@@ -19,16 +21,7 @@ namespace Orchard.Packaging {
_webSiteFolder = webSiteFolder;
}
- class CreateContext {
- public Stream Stream { get; set; }
- public Package Package { get; set; }
-
- public IWebSiteFolder SourceFolder { get; set; }
- public string SourcePath { get; set; }
- public string TargetPath { get; set; }
-
- public XDocument Project { get; set; }
- }
+ #region IPackageBuilder Members
public Stream BuildPackage(ExtensionDescriptor extensionDescriptor) {
var context = new CreateContext();
@@ -37,7 +30,7 @@ namespace Orchard.Packaging {
EstablishPaths(context, _webSiteFolder, extensionDescriptor.Location, extensionDescriptor.Name);
SetCoreProperties(context, extensionDescriptor);
- var projectFile = extensionDescriptor.Name + ".csproj";
+ string projectFile = extensionDescriptor.Name + ".csproj";
if (LoadProject(context, projectFile)) {
EmbedVirtualFile(context, projectFile, MediaTypeNames.Text.Xml);
EmbedProjectFiles(context, "Compile", "Content", "None", "EmbeddedResource");
@@ -48,14 +41,17 @@ namespace Orchard.Packaging {
EndPackage(context);
}
- if (context.Stream.CanSeek)
+ if (context.Stream.CanSeek) {
context.Stream.Seek(0, SeekOrigin.Begin);
+ }
return context.Stream;
}
+ #endregion
+
private void SetCoreProperties(CreateContext context, ExtensionDescriptor extensionDescriptor) {
- var properties = context.Package.PackageProperties;
+ PackageProperties properties = context.Package.PackageProperties;
properties.Title = extensionDescriptor.DisplayName ?? extensionDescriptor.Name;
//properties.Subject = "";
properties.Creator = extensionDescriptor.Author;
@@ -76,16 +72,16 @@ namespace Orchard.Packaging {
private void EmbedProjectFiles(CreateContext context, params string[] itemGroupTypes) {
- var itemGroups = context.Project
+ IEnumerable itemGroups = context.Project
.Elements(Ns("Project"))
.Elements(Ns("ItemGroup"));
- foreach (var itemGroupType in itemGroupTypes) {
- var includePaths = itemGroups
+ foreach (string itemGroupType in itemGroupTypes) {
+ IEnumerable includePaths = itemGroups
.Elements(Ns(itemGroupType))
.Attributes("Include")
.Select(x => x.Value);
- foreach (var includePath in includePaths) {
+ foreach (string includePath in includePaths) {
EmbedVirtualFile(context, includePath, MediaTypeNames.Application.Octet);
}
}
@@ -104,14 +100,13 @@ namespace Orchard.Packaging {
foreach (var entry in entries) {
var assemblyName = new AssemblyName(entry.Include.Value);
- var hintPath = entry.HintPath != null ? entry.HintPath.Value : null;
+ string hintPath = entry.HintPath != null ? entry.HintPath.Value : null;
- var virtualPath = "bin/" + assemblyName.Name + ".dll";
+ string virtualPath = "bin/" + assemblyName.Name + ".dll";
if (context.SourceFolder.FileExists(context.SourcePath + virtualPath)) {
EmbedVirtualFile(context, virtualPath, MediaTypeNames.Application.Octet);
}
- else if (hintPath != null) {
- }
+ else if (hintPath != null) {}
}
}
@@ -120,19 +115,19 @@ namespace Orchard.Packaging {
}
- static void BeginPackage(CreateContext context) {
+ private static void BeginPackage(CreateContext context) {
context.Stream = new MemoryStream();
context.Package = Package.Open(context.Stream, FileMode.Create, FileAccess.ReadWrite);
}
- static void EstablishPaths(CreateContext context, IWebSiteFolder webSiteFolder, string locationPath, string moduleName) {
+ private static void EstablishPaths(CreateContext context, IWebSiteFolder webSiteFolder, string locationPath, string moduleName) {
context.SourceFolder = webSiteFolder;
context.SourcePath = "~/Modules/" + moduleName + "/";
context.TargetPath = "\\" + moduleName + "\\";
}
- static bool LoadProject(CreateContext context, string relativePath) {
- var virtualPath = context.SourcePath + relativePath;
+ private static bool LoadProject(CreateContext context, string relativePath) {
+ string virtualPath = context.SourcePath + relativePath;
if (context.SourceFolder.FileExists(virtualPath)) {
context.Project = XDocument.Parse(context.SourceFolder.ReadFile(context.SourcePath + relativePath));
return true;
@@ -140,17 +135,32 @@ namespace Orchard.Packaging {
return false;
}
- static Uri EmbedVirtualFile(CreateContext context, string relativePath, string contentType) {
- var partUri = PackUriHelper.CreatePartUri(new Uri(context.TargetPath + relativePath, UriKind.Relative));
- var packagePart = context.Package.CreatePart(partUri, contentType);
- using (var stream = packagePart.GetStream(FileMode.Create, FileAccess.Write)) {
- context.SourceFolder.CopyFileTo(context.SourcePath + relativePath, stream, true/*actualContent*/);
+ private static Uri EmbedVirtualFile(CreateContext context, string relativePath, string contentType) {
+ Uri partUri = PackUriHelper.CreatePartUri(new Uri(context.TargetPath + relativePath, UriKind.Relative));
+ PackagePart packagePart = context.Package.CreatePart(partUri, contentType);
+ using (Stream stream = packagePart.GetStream(FileMode.Create, FileAccess.Write)) {
+ context.SourceFolder.CopyFileTo(context.SourcePath + relativePath, stream, true /*actualContent*/);
}
return partUri;
}
- static void EndPackage(CreateContext context) {
+ private static void EndPackage(CreateContext context) {
context.Package.Close();
}
+
+ #region Nested type: CreateContext
+
+ private class CreateContext {
+ public Stream Stream { get; set; }
+ public Package Package { get; set; }
+
+ public IWebSiteFolder SourceFolder { get; set; }
+ public string SourcePath { get; set; }
+ public string TargetPath { get; set; }
+
+ public XDocument Project { get; set; }
+ }
+
+ #endregion
}
-}
+}
\ No newline at end of file
diff --git a/src/Orchard/Packaging/PackageData.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageData.cs
similarity index 81%
rename from src/Orchard/Packaging/PackageData.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageData.cs
index 07048a08f..6250f0d1b 100644
--- a/src/Orchard/Packaging/PackageData.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageData.cs
@@ -1,6 +1,6 @@
using System.IO;
-namespace Orchard.Packaging {
+namespace Orchard.Packaging.Services {
public class PackageData {
public string ExtensionName { get; set; }
public string ExtensionVersion { get; set; }
diff --git a/src/Orchard/Packaging/PackageExpander.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageExpander.cs
similarity index 73%
rename from src/Orchard/Packaging/PackageExpander.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageExpander.cs
index 61051ae77..e794a4627 100644
--- a/src/Orchard/Packaging/PackageExpander.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageExpander.cs
@@ -1,13 +1,16 @@
using System;
+using System.Collections.Generic;
using System.IO;
using System.IO.Packaging;
using System.Linq;
using System.Reflection;
using System.Xml.Linq;
+using Orchard.Environment.Extensions;
using Orchard.FileSystems.VirtualPath;
using Orchard.Localization;
-namespace Orchard.Packaging {
+namespace Orchard.Packaging.Services {
+ [OrchardFeature("PackagingServices")]
public class PackageExpander : IPackageExpander {
private const string ContentTypePrefix = "Orchard ";
private readonly IVirtualPathProvider _virtualPathProvider;
@@ -20,20 +23,7 @@ namespace Orchard.Packaging {
public Localizer T { get; set; }
- class ExpandContext {
- public Stream Stream { get; set; }
- public Package Package { get; set; }
-
- public string ExtensionName { get; set; }
- public string ExtensionVersion { get; set; }
- public string ExtensionType { get; set; }
-
- public string TargetPath { get; set; }
-
- public string SourcePath { get; set; }
-
- public XDocument Project { get; set; }
- }
+ #region IPackageExpander Members
public PackageInfo ExpandPackage(Stream packageStream) {
var context = new ExpandContext();
@@ -42,7 +32,7 @@ namespace Orchard.Packaging {
GetCoreProperties(context);
EstablishPaths(context, _virtualPathProvider);
- var projectFile = context.ExtensionName + ".csproj";
+ string projectFile = context.ExtensionName + ".csproj";
if (LoadProject(context, projectFile)) {
ExtractFile(context, projectFile);
ExtractProjectFiles(context, "Compile", "Content", "None", "EmbeddedResource");
@@ -61,32 +51,35 @@ namespace Orchard.Packaging {
};
}
- private void ExtractFile(ExpandContext context, string relativePath) {
- var partUri = PackUriHelper.CreatePartUri(new Uri(context.SourcePath + relativePath, UriKind.Relative));
- var packagePart = context.Package.GetPart(partUri);
- using (var packageStream = packagePart.GetStream(FileMode.Open, FileAccess.Read)) {
- var filePath = _virtualPathProvider.Combine(context.TargetPath, relativePath);
- var folderPath = _virtualPathProvider.GetDirectoryName(filePath);
- if (!_virtualPathProvider.DirectoryExists(folderPath))
- _virtualPathProvider.CreateDirectory(folderPath);
+ #endregion
- using (var fileStream = _virtualPathProvider.CreateFile(filePath)) {
+ private void ExtractFile(ExpandContext context, string relativePath) {
+ Uri partUri = PackUriHelper.CreatePartUri(new Uri(context.SourcePath + relativePath, UriKind.Relative));
+ PackagePart packagePart = context.Package.GetPart(partUri);
+ using (Stream packageStream = packagePart.GetStream(FileMode.Open, FileAccess.Read)) {
+ string filePath = _virtualPathProvider.Combine(context.TargetPath, relativePath);
+ string folderPath = _virtualPathProvider.GetDirectoryName(filePath);
+ if (!_virtualPathProvider.DirectoryExists(folderPath)) {
+ _virtualPathProvider.CreateDirectory(folderPath);
+ }
+
+ using (Stream fileStream = _virtualPathProvider.CreateFile(filePath)) {
packageStream.CopyTo(fileStream);
}
}
}
private void ExtractProjectFiles(ExpandContext context, params string[] itemGroupTypes) {
- var itemGroups = context.Project
+ IEnumerable itemGroups = context.Project
.Elements(Ns("Project"))
.Elements(Ns("ItemGroup"));
- foreach (var itemGroupType in itemGroupTypes) {
- var includePaths = itemGroups
+ foreach (string itemGroupType in itemGroupTypes) {
+ IEnumerable includePaths = itemGroups
.Elements(Ns(itemGroupType))
.Attributes("Include")
.Select(x => x.Value);
- foreach (var includePath in includePaths) {
+ foreach (string includePath in includePaths) {
ExtractFile(context, includePath);
}
}
@@ -105,19 +98,18 @@ namespace Orchard.Packaging {
foreach (var entry in entries) {
var assemblyName = new AssemblyName(entry.Include.Value);
- var hintPath = entry.HintPath != null ? entry.HintPath.Value : null;
+ string hintPath = entry.HintPath != null ? entry.HintPath.Value : null;
- var virtualPath = "bin/" + assemblyName.Name + ".dll";
+ string virtualPath = "bin/" + assemblyName.Name + ".dll";
if (PartExists(context, virtualPath)) {
ExtractFile(context, virtualPath);
}
- else if (hintPath != null) {
- }
+ else if (hintPath != null) {}
}
}
private bool PartExists(ExpandContext context, string relativePath) {
- var projectUri = PackUriHelper.CreatePartUri(new Uri(context.SourcePath + relativePath, UriKind.Relative));
+ Uri projectUri = PackUriHelper.CreatePartUri(new Uri(context.SourcePath + relativePath, UriKind.Relative));
return context.Package.PartExists(projectUri);
}
@@ -125,12 +117,14 @@ namespace Orchard.Packaging {
private XName Ns(string localName) {
return XName.Get(localName, "http://schemas.microsoft.com/developer/msbuild/2003");
}
+
private static bool LoadProject(ExpandContext context, string relativePath) {
- var projectUri = PackUriHelper.CreatePartUri(new Uri(context.SourcePath + relativePath, UriKind.Relative));
- if (!context.Package.PartExists(projectUri))
+ Uri projectUri = PackUriHelper.CreatePartUri(new Uri(context.SourcePath + relativePath, UriKind.Relative));
+ if (!context.Package.PartExists(projectUri)) {
return false;
- var part = context.Package.GetPart(projectUri);
- using (var stream = part.GetStream(FileMode.Open, FileAccess.Read)) {
+ }
+ PackagePart part = context.Package.GetPart(projectUri);
+ using (Stream stream = part.GetStream(FileMode.Open, FileAccess.Read)) {
context.Project = XDocument.Load(stream);
}
return true;
@@ -155,9 +149,10 @@ namespace Orchard.Packaging {
context.ExtensionName = context.Package.PackageProperties.Identifier;
context.ExtensionVersion = context.Package.PackageProperties.Version;
- var contentType = context.Package.PackageProperties.ContentType;
- if (contentType.StartsWith(ContentTypePrefix))
+ string contentType = context.Package.PackageProperties.ContentType;
+ if (contentType.StartsWith(ContentTypePrefix)) {
context.ExtensionType = contentType.Substring(ContentTypePrefix.Length);
+ }
}
private void EstablishPaths(ExpandContext context, IVirtualPathProvider virtualPathProvider) {
@@ -173,5 +168,24 @@ namespace Orchard.Packaging {
throw new OrchardCoreException(T("Unknown extension type \"{0}\"", context.ExtensionType));
}
}
+
+ #region Nested type: ExpandContext
+
+ private class ExpandContext {
+ public Stream Stream { get; set; }
+ public Package Package { get; set; }
+
+ public string ExtensionName { get; set; }
+ public string ExtensionVersion { get; set; }
+ public string ExtensionType { get; set; }
+
+ public string TargetPath { get; set; }
+
+ public string SourcePath { get; set; }
+
+ public XDocument Project { get; set; }
+ }
+
+ #endregion
}
}
\ No newline at end of file
diff --git a/src/Orchard/Packaging/PackageManager.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageManager.cs
similarity index 70%
rename from src/Orchard/Packaging/PackageManager.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageManager.cs
index 7934d0891..61243e77e 100644
--- a/src/Orchard/Packaging/PackageManager.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageManager.cs
@@ -3,13 +3,15 @@ using System.IO.Packaging;
using System.Linq;
using System.Net;
using Orchard.Environment.Extensions;
+using Orchard.Environment.Extensions.Models;
-namespace Orchard.Packaging {
+namespace Orchard.Packaging.Services {
+ [OrchardFeature("PackagingServices")]
public class PackageManager : IPackageManager {
private readonly IExtensionManager _extensionManager;
- private readonly IPackagingSourceManager _packagingSourceManager;
private readonly IPackageBuilder _packageBuilder;
private readonly IPackageExpander _packageExpander;
+ private readonly IPackagingSourceManager _packagingSourceManager;
public PackageManager(
IExtensionManager extensionManager,
@@ -22,10 +24,13 @@ namespace Orchard.Packaging {
_packageExpander = packageExpander;
}
+ #region IPackageManager Members
+
public PackageData Harvest(string extensionName) {
- var extensionDescriptor = _extensionManager.AvailableExtensions().FirstOrDefault(x => x.Name == extensionName);
- if (extensionDescriptor == null)
+ ExtensionDescriptor extensionDescriptor = _extensionManager.AvailableExtensions().FirstOrDefault(x => x.Name == extensionName);
+ if (extensionDescriptor == null) {
return null;
+ }
return new PackageData {
ExtensionName = extensionDescriptor.Name,
ExtensionVersion = extensionDescriptor.Version,
@@ -34,11 +39,10 @@ namespace Orchard.Packaging {
}
public void Push(PackageData packageData, string feedUrl) {
-
- var request = WebRequest.Create(feedUrl);
+ WebRequest request = WebRequest.Create(feedUrl);
request.Method = "POST";
request.ContentType = "application/x-package";
- using (var requestStream = request.GetRequestStream()) {
+ using (Stream requestStream = request.GetRequestStream()) {
packageData.PackageStream.Seek(0, SeekOrigin.Begin);
packageData.PackageStream.CopyTo(requestStream);
}
@@ -49,13 +53,13 @@ namespace Orchard.Packaging {
}
public PackageData Download(string feedItemId) {
- var entry = _packagingSourceManager.GetModuleList().Single(x => x.SyndicationItem.Id == feedItemId);
- var request = WebRequest.Create(entry.PackageStreamUri);
- using (var response = request.GetResponse()) {
- using (var responseStream = response.GetResponseStream()) {
+ PackagingEntry entry = _packagingSourceManager.GetModuleList().Single(x => x.SyndicationItem.Id == feedItemId);
+ WebRequest request = WebRequest.Create(entry.PackageStreamUri);
+ using (WebResponse response = request.GetResponse()) {
+ using (Stream responseStream = response.GetResponseStream()) {
var stream = new MemoryStream();
responseStream.CopyTo(stream);
- var package = Package.Open(stream);
+ Package package = Package.Open(stream);
try {
return new PackageData {
ExtensionName = package.PackageProperties.Identifier,
@@ -73,5 +77,7 @@ namespace Orchard.Packaging {
public PackageInfo Install(Stream packageStream) {
return _packageExpander.ExpandPackage(packageStream);
}
+
+ #endregion
}
-}
+}
\ No newline at end of file
diff --git a/src/Orchard/Packaging/PackagingEntry.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingEntry.cs
similarity index 86%
rename from src/Orchard/Packaging/PackagingEntry.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingEntry.cs
index 8b94eb626..3e4cbdb2a 100644
--- a/src/Orchard/Packaging/PackagingEntry.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingEntry.cs
@@ -1,6 +1,6 @@
using System.ServiceModel.Syndication;
-namespace Orchard.Packaging {
+namespace Orchard.Packaging.Services {
public class PackagingEntry {
public PackagingSource Source { get; set; }
public SyndicationFeed SyndicationFeed { get; set; }
diff --git a/src/Orchard/Packaging/PackagingSource.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSource.cs
similarity index 75%
rename from src/Orchard/Packaging/PackagingSource.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSource.cs
index e07a30a33..dec7b0aad 100644
--- a/src/Orchard/Packaging/PackagingSource.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSource.cs
@@ -1,6 +1,6 @@
using System;
-namespace Orchard.Packaging {
+namespace Orchard.Packaging.Services {
public class PackagingSource {
public Guid Id { get; set; }
public string FeedUrl { get; set; }
diff --git a/src/Orchard/Packaging/PackagingSourceManager.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs
similarity index 56%
rename from src/Orchard/Packaging/PackagingSourceManager.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs
index 0be5788dc..fd6714b48 100644
--- a/src/Orchard/Packaging/PackagingSourceManager.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Services/PackagingSourceManager.cs
@@ -6,43 +6,34 @@ using System.ServiceModel.Syndication;
using System.Xml;
using System.Xml.Linq;
using System.Xml.Serialization;
+using Orchard.Environment.Extensions;
using Orchard.FileSystems.AppData;
-namespace Orchard.Packaging {
+namespace Orchard.Packaging.Services {
+ [OrchardFeature("PackagingServices")]
public class PackagingSourceManager : IPackagingSourceManager {
+ private static readonly XmlSerializer _sourceSerializer = new XmlSerializer(typeof (List), new XmlRootAttribute("Sources"));
private readonly IAppDataFolder _appDataFolder;
- private static readonly XmlSerializer _sourceSerializer = new XmlSerializer(typeof(List), new XmlRootAttribute("Sources"));
public PackagingSourceManager(IAppDataFolder appDataFolder) {
_appDataFolder = appDataFolder;
}
- static string GetSourcesPath() {
- return ".Packaging/Sources.xml";
- }
- static string GetFeedCachePath(PackagingSource source) {
- return ".Packaging/Feed." + source.Id.ToString("n") + ".xml";
- }
+ #region IPackagingSourceManager Members
public IEnumerable GetSources() {
- var text = _appDataFolder.ReadFile(GetSourcesPath());
- if (string.IsNullOrEmpty(text))
+ string text = _appDataFolder.ReadFile(GetSourcesPath());
+ if (string.IsNullOrEmpty(text)) {
return Enumerable.Empty();
+ }
var textReader = new StringReader(_appDataFolder.ReadFile(GetSourcesPath()));
- return (IEnumerable)_sourceSerializer.Deserialize(textReader);
- }
-
- void SaveSources(IEnumerable sources) {
- var textWriter = new StringWriter();
- _sourceSerializer.Serialize(textWriter, sources.ToList());
-
- _appDataFolder.CreateFile(GetSourcesPath(), textWriter.ToString());
+ return (IEnumerable) _sourceSerializer.Deserialize(textReader);
}
public void AddSource(PackagingSource source) {
UpdateSource(source);
- SaveSources(GetSources().Concat(new[] { source }));
+ SaveSources(GetSources().Concat(new[] {source}));
}
public void RemoveSource(Guid id) {
@@ -50,25 +41,62 @@ namespace Orchard.Packaging {
}
public void UpdateLists() {
- foreach (var source in GetSources()) {
+ foreach (PackagingSource source in GetSources()) {
UpdateSource(source);
}
}
+ public IEnumerable GetModuleList() {
+ IEnumerable packageInfos = GetSources()
+ .SelectMany(
+ source =>
+ Bind(ParseFeed(_appDataFolder.ReadFile(GetFeedCachePath(source))),
+ feed =>
+ feed.Items.SelectMany(
+ item =>
+ Unit(new PackagingEntry {
+ Source = source,
+ SyndicationFeed = feed,
+ SyndicationItem = item,
+ PackageStreamUri = item.Links.Single().GetAbsoluteUri().AbsoluteUri,
+ }))));
+
+
+ return packageInfos.ToArray();
+ }
+
+ #endregion
+
+ private static string GetSourcesPath() {
+ return ".Packaging/Sources.xml";
+ }
+
+ private static string GetFeedCachePath(PackagingSource source) {
+ return ".Packaging/Feed." + source.Id.ToString("n") + ".xml";
+ }
+
+ private void SaveSources(IEnumerable sources) {
+ var textWriter = new StringWriter();
+ _sourceSerializer.Serialize(textWriter, sources.ToList());
+
+ _appDataFolder.CreateFile(GetSourcesPath(), textWriter.ToString());
+ }
+
private void UpdateSource(PackagingSource source) {
- var feed = XDocument.Load(source.FeedUrl, LoadOptions.PreserveWhitespace);
+ XDocument feed = XDocument.Load(source.FeedUrl, LoadOptions.PreserveWhitespace);
_appDataFolder.CreateFile(GetFeedCachePath(source), feed.ToString(SaveOptions.DisableFormatting));
}
- static XName Atom(string localName) {
+ private static XName Atom(string localName) {
return AtomExtensions.AtomXName(localName);
}
- static IEnumerable Unit(T t) where T : class {
- return t != null ? new[] { t } : Enumerable.Empty();
+ private static IEnumerable Unit(T t) where T : class {
+ return t != null ? new[] {t} : Enumerable.Empty();
}
- static IEnumerable Bind(T t, Func> f) where T : class {
+
+ private static IEnumerable Bind(T t, Func> f) where T : class {
return Unit(t).SelectMany(f);
}
@@ -77,24 +105,5 @@ namespace Orchard.Packaging {
formatter.ReadFrom(XmlReader.Create(new StringReader(content)));
return formatter.Feed;
}
-
- public IEnumerable GetModuleList() {
- var packageInfos = GetSources()
- .SelectMany(
- source =>
- Bind(ParseFeed(_appDataFolder.ReadFile(GetFeedCachePath(source))),
- feed =>
- feed.Items.SelectMany(
- item =>
- Unit(new PackagingEntry {
- Source = source,
- SyndicationFeed = feed,
- SyndicationItem = item,
- PackageStreamUri = item.Links.Single().GetAbsoluteUri().AbsoluteUri,
- }))));
-
-
- return packageInfos.ToArray();
- }
}
}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/ViewModels/PackagingHarvestViewModel.cs b/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingHarvestViewModel.cs
similarity index 82%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/ViewModels/PackagingHarvestViewModel.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingHarvestViewModel.cs
index 8baa67c5f..4fc9b2c26 100644
--- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/ViewModels/PackagingHarvestViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingHarvestViewModel.cs
@@ -1,9 +1,9 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Orchard.Environment.Extensions.Models;
-using Orchard.Packaging;
+using Orchard.Packaging.Services;
-namespace Futures.Modules.Packaging.ViewModels {
+namespace Orchard.Packaging.ViewModels {
public class PackagingHarvestViewModel {
public IEnumerable Sources { get; set; }
public IEnumerable Extensions { get; set; }
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/ViewModels/PackagingModulesViewModel.cs b/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingModulesViewModel.cs
similarity index 64%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/ViewModels/PackagingModulesViewModel.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingModulesViewModel.cs
index 351869589..72d718de3 100644
--- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/ViewModels/PackagingModulesViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingModulesViewModel.cs
@@ -1,7 +1,7 @@
using System.Collections.Generic;
-using Orchard.Packaging;
+using Orchard.Packaging.Services;
-namespace Futures.Modules.Packaging.ViewModels {
+namespace Orchard.Packaging.ViewModels {
public class PackagingModulesViewModel {
public IEnumerable Modules { get; set; }
}
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/ViewModels/PackagingSourcesViewModel.cs b/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingSourcesViewModel.cs
similarity index 65%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/ViewModels/PackagingSourcesViewModel.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingSourcesViewModel.cs
index 44ce5695e..fb02faebc 100644
--- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/ViewModels/PackagingSourcesViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/ViewModels/PackagingSourcesViewModel.cs
@@ -1,7 +1,7 @@
using System.Collections.Generic;
-using Orchard.Packaging;
+using Orchard.Packaging.Services;
-namespace Futures.Modules.Packaging.ViewModels {
+namespace Orchard.Packaging.ViewModels {
public class PackagingSourcesViewModel {
public IEnumerable Sources { get; set; }
}
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Harvest.ascx b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Harvest.ascx
similarity index 93%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Harvest.ascx
rename to src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Harvest.ascx
index 5884e4a9d..9865c7d2a 100644
--- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Harvest.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Harvest.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
<%: Html.TitleForPage(T("Packaging").ToString(), T("Harvest Packages").ToString())%>
<%: Html.Partial("_Subnav") %>
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Modules.ascx b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Modules.ascx
similarity index 86%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Modules.ascx
rename to src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Modules.ascx
index 2b804e594..c8ff0ef9f 100644
--- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Modules.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Modules.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
<%: Html.TitleForPage(T("Packaging").ToString(), T("Browse Packages").ToString())%>
<%: Html.Partial("_Subnav") %>
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Sources.ascx b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Sources.ascx
similarity index 85%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Sources.ascx
rename to src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Sources.ascx
index 24eb1d5ef..d78bd5dce 100644
--- a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/Sources.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/Sources.ascx
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %>
<%: Html.TitleForPage(T("Packaging").ToString(), T("Edit Sources").ToString())%>
<%: Html.Partial("_Subnav") %>
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/_Subnav.ascx b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/_Subnav.ascx
similarity index 100%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Packaging/_Subnav.ascx
rename to src/Orchard.Web/Modules/Orchard.Packaging/Views/Packaging/_Subnav.ascx
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Web.config b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Web.config
similarity index 100%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/Views/Web.config
rename to src/Orchard.Web/Modules/Orchard.Packaging/Views/Web.config
diff --git a/src/Orchard.Web/Modules/Futures.Modules.Packaging/Web.config b/src/Orchard.Web/Modules/Orchard.Packaging/Web.config
similarity index 100%
rename from src/Orchard.Web/Modules/Futures.Modules.Packaging/Web.config
rename to src/Orchard.Web/Modules/Orchard.Packaging/Web.config
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index c1f0c2c09..09e43a00f 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -83,6 +83,7 @@ namespace Orchard.Setup.Services {
"Orchard.Users",
"Orchard.Roles",
"TinyMce",
+ "PackagingServices",
"Orchard.Modules",
"Orchard.Themes",
"Orchard.Blogs",
diff --git a/src/Orchard.sln b/src/Orchard.sln
index 94ec16c22..ba28703e7 100644
--- a/src/Orchard.sln
+++ b/src/Orchard.sln
@@ -73,7 +73,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageIndexReferenceImplem
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lucene", "Orchard.Web\Modules\Lucene\Lucene.csproj", "{D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Futures.Modules.Packaging", "Orchard.Web\Modules\Futures.Modules.Packaging\Futures.Modules.Packaging.csproj", "{DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Packaging", "Orchard.Web\Modules\Orchard.Packaging\Orchard.Packaging.csproj", "{DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -236,6 +236,7 @@ Global
{EA2B9121-EF54-40A6-A53E-6593C86EE696} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{0E7646E8-FE8F-43C1-8799-D97860925EC4} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
+ {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}
{ABC826D4-2FA1-4F2F-87DE-E6095F653810} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA}
{F112851D-B023-4746-B6B1-8D2E5AD8F7AA} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA}
{6CB3EB30-F725-45C0-9742-42599BA8E8D2} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA}
@@ -247,6 +248,5 @@ Global
{33B1BC8D-E292-4972-A363-22056B207156} = {383DBA32-4A3E-48D1-AAC3-75377A694452}
{8A4E42CE-79F8-4BE2-8B1E-A6B83432123B} = {383DBA32-4A3E-48D1-AAC3-75377A694452}
{E65E5633-C0FF-453C-A906-481C14F969D6} = {E75A4CE4-CAA6-41E4-B951-33ACC60DC77C}
- {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059} = {E75A4CE4-CAA6-41E4-B951-33ACC60DC77C}
EndGlobalSection
EndGlobal
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index 972eee81f..cde886590 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -105,7 +105,6 @@
3.0
-
@@ -121,7 +120,6 @@
-
False
..\..\lib\yaml\Yaml.dll
@@ -369,18 +367,6 @@
-
-
-
-
-
-
-
-
-
-
-
-