From 9696efe4bba46e98739a07b59c6271aa32495433 Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Fri, 1 Oct 2010 15:48:38 -0700
Subject: [PATCH] Adjusting generation commands to new data migration path and
 file names

--HG--
branch : dev
---
 .../CodeGenerationTemplates/DataMigration.txt      |  2 +-
 .../Commands/CodeGenerationCommands.cs             | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/DataMigration.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/DataMigration.txt
index e80ad786c..a37519809 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/DataMigration.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/DataMigration.txt
@@ -7,7 +7,7 @@ using Orchard.Core.Contents.Extensions;
 using Orchard.Data.Migration;
 
 namespace $$FeatureName$$.DataMigrations {
-    public class $$ClassName$$DataMigration : DataMigrationImpl {
+    public class Migration : DataMigrationImpl {
 
         public int Create() {
 $$Commands$$
diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
index 23c382964..e75881aab 100644
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
@@ -65,16 +65,16 @@ namespace Orchard.CodeGeneration.Commands {
                 return false;
             }
 
-            string dataMigrationsPath = HostingEnvironment.MapPath("~/Modules/" + extensionDescriptor.Name + "/DataMigrations/");
-            string dataMigrationPath = dataMigrationsPath + extensionDescriptor.DisplayName + "DataMigration.cs";
+            string dataMigrationFolderPath = HostingEnvironment.MapPath("~/Modules/" + extensionDescriptor.Name + "/");
+            string dataMigrationFilePath = dataMigrationFolderPath + "Migration.cs";
             string templatesPath = HostingEnvironment.MapPath("~/Modules/Orchard." + ModuleName + "/CodeGenerationTemplates/");
             string moduleCsProjPath = HostingEnvironment.MapPath(string.Format("~/Modules/{0}/{0}.csproj", extensionDescriptor.Name));
                     
-            if (!Directory.Exists(dataMigrationsPath)) {
-                Directory.CreateDirectory(dataMigrationsPath);
+            if (!Directory.Exists(dataMigrationFolderPath)) {
+                Directory.CreateDirectory(dataMigrationFolderPath);
             }
 
-            if (File.Exists(dataMigrationPath)) {
+            if (File.Exists(dataMigrationFilePath)) {
                 Context.Output.WriteLine(T("Data migration already exists in target Module {0}.", extensionDescriptor.Name));
                 return false;
             }
@@ -91,9 +91,8 @@ namespace Orchard.CodeGeneration.Commands {
 
             string dataMigrationText = File.ReadAllText(templatesPath + "DataMigration.txt");
             dataMigrationText = dataMigrationText.Replace("$$FeatureName$$", featureName);
-            dataMigrationText = dataMigrationText.Replace("$$ClassName$$", extensionDescriptor.DisplayName);
             dataMigrationText = dataMigrationText.Replace("$$Commands$$", stringWriter.ToString());
-            File.WriteAllText(dataMigrationPath, dataMigrationText);
+            File.WriteAllText(dataMigrationFilePath, dataMigrationText);
 
             string projectFileText = File.ReadAllText(moduleCsProjPath);
 
@@ -370,6 +369,7 @@ namespace Orchard.CodeGeneration.Commands {
             }
             else {
                 var projectText = File.ReadAllText(_orchardWebProj);
+
                 // find where the first ItemGroup is after any References
                 var refIndex = projectText.LastIndexOf("<Reference Include");
                 if (refIndex != -1) {