From 3da92e40f320c47d90f074d11579101ea43269fc Mon Sep 17 00:00:00 2001
From: Suha Can <Suha.Can@microsoft.com>
Date: Fri, 9 Jul 2010 09:27:45 -0700
Subject: [PATCH] - Removing Orchard prefix from modules/controllers created
 via scaffolding cmds.

--HG--
branch : dev
---
 .../Orchard.DevTools/Commands/ScaffoldingCommands.cs      | 8 ++++----
 .../Orchard.DevTools/ScaffoldingTemplates/Controller.txt  | 3 ++-
 .../ScaffoldingTemplates/ModuleAssemblyInfo.txt           | 2 +-
 .../ScaffoldingTemplates/ModuleCsProj.txt                 | 4 ++--
 .../ScaffoldingTemplates/ModuleManifest.txt               | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ScaffoldingCommands.cs b/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ScaffoldingCommands.cs
index 976b8c766..6a3a4fb12 100644
--- a/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ScaffoldingCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ScaffoldingCommands.cs
@@ -142,7 +142,7 @@ namespace Orchard.DevTools.Commands {
             if (IncludeInSolution) {
                 // Add project reference to Orchard.Web.csproj
                 string webProjectReference = string.Format(
-                    "</ProjectReference>\r\n    <ProjectReference Include=\"Modules\\Orchard.{0}\\Orchard.{0}.csproj\">\r\n      <Project>{{{1}}}</Project>\r\n      <Name>Orchard.{0}</Name>\r\n    ",
+                    "</ProjectReference>\r\n    <ProjectReference Include=\"Modules\\{0}\\{0}.csproj\">\r\n      <Project>{{{1}}}</Project>\r\n      <Name>{0}</Name>\r\n    ",
                     moduleName, projectGuid);
                 string webProjectText = File.ReadAllText(rootWebProjectPath);
                 webProjectText = webProjectText.Insert(webProjectText.LastIndexOf("</ProjectReference>\r\n"), webProjectReference);
@@ -152,7 +152,7 @@ namespace Orchard.DevTools.Commands {
                 string solutionPath = Directory.GetParent(rootWebProjectPath).Parent.FullName + "\\Orchard.sln";
                 if (File.Exists(solutionPath)) {
                     string projectReference = string.Format(
-                        "EndProject\r\nProject(\"{{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}}\") = \"Orchard.{0}\", \"Orchard.Web\\Modules\\Orchard.{0}\\Orchard.{0}.csproj\", \"{{{1}}}\"\r\n",
+                        "EndProject\r\nProject(\"{{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}}\") = \"{0}\", \"Orchard.Web\\Modules\\{0}\\{0}.csproj\", \"{{{1}}}\"\r\n",
                         moduleName, projectGuid);
                     string projectConfiguationPlatforms = string.Format(
                         "GlobalSection(ProjectConfigurationPlatforms) = postSolution\r\n\t\t{{{0}}}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r\n\t\t{{{0}}}.Debug|Any CPU.Build.0 = Debug|Any CPU\r\n\t\t{{{0}}}.Release|Any CPU.ActiveCfg = Release|Any CPU\r\n\t\t{{{0}}}.Release|Any CPU.Build.0 = Release|Any CPU\r\n",
@@ -171,7 +171,7 @@ namespace Orchard.DevTools.Commands {
         }
 
         private static void CreateFilesFromTemplates(string moduleName, string projectGuid) {
-            string modulePath = HostingEnvironment.MapPath("~/Modules/Orchard." + moduleName + "/");
+            string modulePath = HostingEnvironment.MapPath("~/Modules/" + moduleName + "/");
             string propertiesPath = modulePath + "Properties";
             string templatesPath = HostingEnvironment.MapPath("~/Modules/Orchard.DevTools/ScaffoldingTemplates/");
 
@@ -188,7 +188,7 @@ namespace Orchard.DevTools.Commands {
             templateText = File.ReadAllText(templatesPath + "\\ModuleCsProj.txt");
             templateText = templateText.Replace("$$ModuleName$$", moduleName);
             templateText = templateText.Replace("$$ModuleProjectGuid$$", projectGuid);
-            File.WriteAllText(modulePath + "\\Orchard." + moduleName + ".csproj", templateText);
+            File.WriteAllText(modulePath + "\\" + moduleName + ".csproj", templateText);
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/Controller.txt b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/Controller.txt
index 6944907bf..2e1d7a9e4 100644
--- a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/Controller.txt
+++ b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/Controller.txt
@@ -1,7 +1,8 @@
 using System.Web.Mvc;
 using Orchard.Localization;
+using Orchard;
 
-namespace Orchard.$$ModuleName$$.Controllers {
+namespace $$ModuleName$$.Controllers {
     public class $$ControllerName$$ : Controller {
         public IOrchardServices Services { get; set; }
 
diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleAssemblyInfo.txt b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleAssemblyInfo.txt
index f3b25aa1e..d09371c2e 100644
--- a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleAssemblyInfo.txt
+++ b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleAssemblyInfo.txt
@@ -5,7 +5,7 @@ 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("Orchard.$$ModuleName$$")]
+[assembly: AssemblyTitle("$$ModuleName$$")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleCsProj.txt b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleCsProj.txt
index 43ea6715f..d6b6dd2d3 100644
--- a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleCsProj.txt
+++ b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleCsProj.txt
@@ -9,8 +9,8 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Orchard.$$ModuleName$$</RootNamespace>
-    <AssemblyName>Orchard.$$ModuleName$$</AssemblyName>
+    <RootNamespace>$$ModuleName$$</RootNamespace>
+    <AssemblyName>$$ModuleName$$</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <FileUpgradeFlags>
diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleManifest.txt b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleManifest.txt
index 7f7d0b295..82a831e23 100644
--- a/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleManifest.txt
+++ b/src/Orchard.Web/Modules/Orchard.DevTools/ScaffoldingTemplates/ModuleManifest.txt
@@ -1,5 +1,5 @@
 name: $$ModuleName$$
 antiforgery: enabled
 features:
-    Orchard.$$ModuleName$$:
+    $$ModuleName$$:
         Description: Description for feature $$ModuleName$$.
\ No newline at end of file