andromdaplugins-cvs

[Chris M. <cm...@us...>]

  User: cmicali 
  Date: 06/05/28 08:49:55

  Modified:    etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
                        Add-In Readme.rtf
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
                        AndroMDA.VS80AddIn.csproj Resource1.Designer.cs
                        Resource1.resx WizardSolutionProcessor.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
                        MDASolutionWizard.cs MDASolutionWizard.designer.cs
                        MDASolutionWizard.resx
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf
                        andromda.xml
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda
                        project.xml
  Log:
  - Added web project generation to the solution wizard
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.10      +1 -0      plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj
  
  Index: AndroMDA.VS80AddIn.csproj
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.csproj,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -r1.9 -r1.10
  --- AndroMDA.VS80AddIn.csproj	28 May 2006 05:54:01 -0000	1.9
  +++ AndroMDA.VS80AddIn.csproj	28 May 2006 15:49:55 -0000	1.10
  @@ -302,6 +302,7 @@
       <None Include="Resources\Lib\NHibernate.Nullables2.dll" />
       <None Include="Resources\Web\Bin\cvsignore" />
       <None Include="Resources\Web\cvsignore" />
  +    <None Include="Resources\Web\nhibernate.config" />
     </ItemGroup>
     <ItemGroup>
       <Folder Include="MavenProxy\" />
  
  
  
  1.4       +18 -2     plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.Designer.cs
  
  Index: Resource1.Designer.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.Designer.cs,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- Resource1.Designer.cs	28 May 2006 05:54:01 -0000	1.3
  +++ Resource1.Designer.cs	28 May 2006 15:49:55 -0000	1.4
  @@ -300,7 +300,7 @@
           ///
           ///&lt;project&gt;
           ///    &lt;extend&gt;../project.xml&lt;/extend&gt;
  -        ///    &lt;name&gt;Whatever MDA&lt;/name&gt;
  +        ///    &lt;name&gt;${wizard.application.name} MDA&lt;/name&gt;
           ///    &lt;artifactId&gt;${pom.groupId}-mda&lt;/artifactId&gt;
           ///    &lt;shortDescription&gt;${pom.name} Component&lt;/shortDescription&gt;
           ///    &lt;description&gt;Contains the ${pom.name} module&lt;/description&gt;
  @@ -309,7 +309,7 @@
           ///            &lt;groupId&gt;andromda&lt;/groupId&gt;
           ///            &lt;artifactId&gt;andromda-profile&lt;/artifactId&gt;
           ///            &lt;version&gt;${andromda.version}&lt;/version&gt;
  -        ///            &lt;type&gt;xml.zi [rest of string was truncated]&quot;;.
  +        ///       [rest of string was truncated]&quot;;.
           /// </summary>
           internal static string mda_project_xml {
               get {
  @@ -473,5 +473,21 @@
                   return ResourceManager.GetString("web_cvsignore", resourceCulture);
               }
           }
  +        
  +        /// <summary>
  +        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot; ?&gt;
  +        ///&lt;hibernate-configuration  xmlns=&quot;urn:nhibernate-configuration-2.0&quot; &gt;
  +        ///    &lt;session-factory name=&quot;nhibernator&quot;&gt;
  +        ///        &lt;!-- properties --&gt;
  +        ///        &lt;property name=&quot;hibernate.connection.provider&quot;&gt;NHibernate.Connection.DriverConnectionProvider&lt;/property&gt;
  +        ///        &lt;property name=&quot;hibernate.dialect&quot;&gt;${wizard.database.nhibernatedialect}&lt;/property&gt;
  +        ///        &lt;property name=&quot;hibernate.connection.driver_class&quot;&gt;${wizard.hibernate.connection.driver_class}&lt;/property&gt;
  +        ///        &lt; [rest of string was truncated]&quot;;.
  +        /// </summary>
  +        internal static string web_nhibernate_config {
  +            get {
  +                return ResourceManager.GetString("web_nhibernate_config", resourceCulture);
  +            }
  +        }
       }
   }
  
  
  
  1.4       +3 -0      plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.resx
  
  Index: Resource1.resx
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.resx,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- Resource1.resx	28 May 2006 05:54:01 -0000	1.3
  +++ Resource1.resx	28 May 2006 15:49:55 -0000	1.4
  @@ -208,4 +208,7 @@
     <data name="web_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
       <value>Resources\Web\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </data>
  +  <data name="web_nhibernate_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
  +    <value>Resources\Web\nhibernate.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
  +  </data>
   </root>
  \ No newline at end of file
  
  
  
  1.5       +19 -0     plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs
  
  Index: WizardSolutionProcessor.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- WizardSolutionProcessor.cs	28 May 2006 05:54:01 -0000	1.4
  +++ WizardSolutionProcessor.cs	28 May 2006 15:49:55 -0000	1.5
  @@ -181,6 +181,21 @@
   			{
   				AddToStatus("Creating web project " + m_configuration["projects.web.name"] + "...");
   				webProject = VSSolutionUtils.AddWebProjectToSolution(m_configuration["projects.web.name"], (Solution2)m_applicationObject.Solution);
  +				VsWebSite.VSWebSite webSite = webProject.Object as VsWebSite.VSWebSite;
  +
  +				// TODO: Create or modify web.config to include AndroMDA.NHibernateSupport				
  +				
  +				if (m_configuration["projects.web.usenhibernateconfig"] == "true")
  +				{
  +					WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\nhibernate.config", ParseVariables(Resource1.web_nhibernate_config));
  +				}
  +				else
  +				{
  +					// TODO: Add NHibernate settings to web.config
  +				}
  +
  +				// TODO: Render Global.asax (if applicable)
  +
   				// Write Web/cvsignore and Web\Bin\cvsignore
   				if (versionControl)
   				{
  @@ -188,6 +203,10 @@
   					CreateDirectory(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Bin");
   					WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Bin\\" + ignoreFile, ParseVariables(Resource1.web_bin_cvsignore));
   				}
  +
  +				// Refresh folder view
  +				webSite.Refresh();
  +
   			}
   
   			AddToStatus("Creating AndroMDA configuration files...");
  
  
  
  1.6       +6 -1      plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.cs
  
  Index: MDASolutionWizard.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.cs,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- MDASolutionWizard.cs	28 May 2006 05:54:02 -0000	1.5
  +++ MDASolutionWizard.cs	28 May 2006 15:49:55 -0000	1.6
  @@ -79,6 +79,8 @@
   			txtWebProject.Text = solutionName + ".Web";
   			cbCreateSchemaExport.Checked = true;
   			cbCreateWebProject.Checked = false;
  +			rbNHibernateConfig.Enabled = cbCreateWebProject.Checked;
  +			rbWebConfig.Enabled = cbCreateWebProject.Checked;
   
               // Give the wizard a reference to this form so it can
               // set this.AcceptButton to the Next button
  @@ -99,6 +101,8 @@
   		private void cbCreateWebProject_CheckedChanged(object sender, EventArgs e)
   		{
   			txtWebProject.Enabled = cbCreateWebProject.Checked;
  +			rbNHibernateConfig.Enabled = cbCreateWebProject.Checked;
  +			rbWebConfig.Enabled = cbCreateWebProject.Checked;
   		}
   
           /// <summary>
  @@ -346,6 +350,7 @@
   			config["projects.web.name"] = txtWebProject.Text;
   			config["projects.web.dir"] = txtWebProject.Text;
   			config["projects.web.create"] = cbCreateWebProject.Checked ? "true" : "false";
  +			config["projects.web.usenhibernateconfig"] = rbNHibernateConfig.Checked ? "true" : "false";
   
               config["database.name"] = txtApplicationName.Text.Replace(" ", string.Empty).Replace(".", string.Empty);
   
  
  
  
  1.4       +369 -341  plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.designer.cs
  
  Index: MDASolutionWizard.designer.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.designer.cs,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- MDASolutionWizard.designer.cs	28 May 2006 05:54:02 -0000	1.3
  +++ MDASolutionWizard.designer.cs	28 May 2006 15:49:55 -0000	1.4
  @@ -30,6 +30,7 @@
           {
   			this.components = new System.ComponentModel.Container();
   			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MDASolutionWizard));
  +			this.imageList1 = new System.Windows.Forms.ImageList(this.components);
   			this.wizard1 = new Gui.Wizard.Wizard();
   			this.wizardPageSolutionInfo = new Gui.Wizard.WizardPage();
   			this.ddlVersionControl = new System.Windows.Forms.ComboBox();
  @@ -41,21 +42,21 @@
   			this.txtApplicationName = new System.Windows.Forms.TextBox();
   			this.label12 = new System.Windows.Forms.Label();
   			this.header6 = new Gui.Wizard.Header();
  -			this.wizardPageCommonProject = new Gui.Wizard.WizardPage();
  -			this.usrCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
  -			this.header1 = new Gui.Wizard.Header();
  -			this.wizardPageCoreProject = new Gui.Wizard.WizardPage();
  -			this.header2 = new Gui.Wizard.Header();
  -			this.usrCoreProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
  -			this.wizardPageSchemaExportProject = new Gui.Wizard.WizardPage();
  -			this.cbCreateSchemaExport = new System.Windows.Forms.CheckBox();
  -			this.txtSchemaExportProject = new System.Windows.Forms.TextBox();
  -			this.lblDescription = new System.Windows.Forms.Label();
  -			this.header3 = new Gui.Wizard.Header();
  -			this.wizardPageWebProject = new Gui.Wizard.WizardPage();
  -			this.cbCreateWebProject = new System.Windows.Forms.CheckBox();
  -			this.txtWebProject = new System.Windows.Forms.TextBox();
  -			this.header7 = new Gui.Wizard.Header();
  +			this.wizardPageWelcome = new Gui.Wizard.WizardPage();
  +			this.label9 = new System.Windows.Forms.Label();
  +			this.label8 = new System.Windows.Forms.Label();
  +			this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
  +			this.wizardPageComplete = new Gui.Wizard.WizardPage();
  +			this.lblFinishPageTitle = new System.Windows.Forms.Label();
  +			this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
  +			this.lblFinishPageDescription = new System.Windows.Forms.Label();
  +			this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
  +			this.txtErrorMessage = new System.Windows.Forms.TextBox();
  +			this.wizardPageProcessing = new Gui.Wizard.WizardPage();
  +			this.lstStatus = new System.Windows.Forms.ListBox();
  +			this.label7 = new System.Windows.Forms.Label();
  +			this.header5 = new Gui.Wizard.Header();
  +			this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
   			this.wizardPageConfirmChoices = new Gui.Wizard.WizardPage();
   			this.lblWebProject = new System.Windows.Forms.Label();
   			this.lblSchemaExportProject = new System.Windows.Forms.Label();
  @@ -76,29 +77,25 @@
   			this.label4 = new System.Windows.Forms.Label();
   			this.label3 = new System.Windows.Forms.Label();
   			this.header4 = new Gui.Wizard.Header();
  -			this.wizardPageWelcome = new Gui.Wizard.WizardPage();
  -			this.label9 = new System.Windows.Forms.Label();
  -			this.label8 = new System.Windows.Forms.Label();
  -			this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
  -			this.wizardPageComplete = new Gui.Wizard.WizardPage();
  -			this.lblFinishPageTitle = new System.Windows.Forms.Label();
  -			this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
  -			this.lblFinishPageDescription = new System.Windows.Forms.Label();
  -			this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
  -			this.imageList1 = new System.Windows.Forms.ImageList(this.components);
  -			this.txtErrorMessage = new System.Windows.Forms.TextBox();
  -			this.wizardPageProcessing = new Gui.Wizard.WizardPage();
  -			this.lstStatus = new System.Windows.Forms.ListBox();
  -			this.label7 = new System.Windows.Forms.Label();
  -			this.header5 = new Gui.Wizard.Header();
  -			this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
  +			this.wizardPageWebProject = new Gui.Wizard.WizardPage();
  +			this.cbCreateWebProject = new System.Windows.Forms.CheckBox();
  +			this.txtWebProject = new System.Windows.Forms.TextBox();
  +			this.header7 = new Gui.Wizard.Header();
  +			this.wizardPageSchemaExportProject = new Gui.Wizard.WizardPage();
  +			this.cbCreateSchemaExport = new System.Windows.Forms.CheckBox();
  +			this.txtSchemaExportProject = new System.Windows.Forms.TextBox();
  +			this.lblDescription = new System.Windows.Forms.Label();
  +			this.header3 = new Gui.Wizard.Header();
  +			this.wizardPageCoreProject = new Gui.Wizard.WizardPage();
  +			this.header2 = new Gui.Wizard.Header();
  +			this.usrCoreProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
  +			this.wizardPageCommonProject = new Gui.Wizard.WizardPage();
  +			this.usrCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
  +			this.header1 = new Gui.Wizard.Header();
  +			this.rbNHibernateConfig = new System.Windows.Forms.RadioButton();
  +			this.rbWebConfig = new System.Windows.Forms.RadioButton();
   			this.wizard1.SuspendLayout();
   			this.wizardPageSolutionInfo.SuspendLayout();
  -			this.wizardPageCommonProject.SuspendLayout();
  -			this.wizardPageCoreProject.SuspendLayout();
  -			this.wizardPageSchemaExportProject.SuspendLayout();
  -			this.wizardPageWebProject.SuspendLayout();
  -			this.wizardPageConfirmChoices.SuspendLayout();
   			this.wizardPageWelcome.SuspendLayout();
   			((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
   			this.wizardPageComplete.SuspendLayout();
  @@ -106,20 +103,32 @@
   			this.wizardPageProcessing.SuspendLayout();
   			this.header5.SuspendLayout();
   			((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
  +			this.wizardPageConfirmChoices.SuspendLayout();
  +			this.wizardPageWebProject.SuspendLayout();
  +			this.wizardPageSchemaExportProject.SuspendLayout();
  +			this.wizardPageCoreProject.SuspendLayout();
  +			this.wizardPageCommonProject.SuspendLayout();
   			this.SuspendLayout();
   			// 
  +			// imageList1
  +			// 
  +			this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
  +			this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
  +			this.imageList1.Images.SetKeyName(0, "INFO.ICO");
  +			this.imageList1.Images.SetKeyName(1, "error.ico");
  +			// 
   			// wizard1
   			// 
   			this.wizard1.ContainingForm = null;
  +			this.wizard1.Controls.Add(this.wizardPageWebProject);
  +			this.wizard1.Controls.Add(this.wizardPageSchemaExportProject);
  +			this.wizard1.Controls.Add(this.wizardPageCoreProject);
  +			this.wizard1.Controls.Add(this.wizardPageCommonProject);
   			this.wizard1.Controls.Add(this.wizardPageSolutionInfo);
   			this.wizard1.Controls.Add(this.wizardPageWelcome);
   			this.wizard1.Controls.Add(this.wizardPageComplete);
   			this.wizard1.Controls.Add(this.wizardPageProcessing);
   			this.wizard1.Controls.Add(this.wizardPageConfirmChoices);
  -			this.wizard1.Controls.Add(this.wizardPageWebProject);
  -			this.wizard1.Controls.Add(this.wizardPageSchemaExportProject);
  -			this.wizard1.Controls.Add(this.wizardPageCoreProject);
  -			this.wizard1.Controls.Add(this.wizardPageCommonProject);
   			this.wizard1.Dock = System.Windows.Forms.DockStyle.Fill;
   			this.wizard1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
   			this.wizard1.Location = new System.Drawing.Point(0, 0);
  @@ -250,182 +259,176 @@
   			this.header6.TabIndex = 26;
   			this.header6.Title = "Application Information";
   			// 
  -			// wizardPageCommonProject
  -			// 
  -			this.wizardPageCommonProject.Controls.Add(this.usrCommonProject);
  -			this.wizardPageCommonProject.Controls.Add(this.header1);
  -			this.wizardPageCommonProject.Dock = System.Windows.Forms.DockStyle.Fill;
  -			this.wizardPageCommonProject.IsFinishPage = false;
  -			this.wizardPageCommonProject.Location = new System.Drawing.Point(0, 0);
  -			this.wizardPageCommonProject.Name = "wizardPageCommonProject";
  -			this.wizardPageCommonProject.Size = new System.Drawing.Size(525, 297);
  -			this.wizardPageCommonProject.TabIndex = 2;
  -			this.wizardPageCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCommonProject_CloseFromNext);
  -			this.wizardPageCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageCommonProject_ShowFromNext);
  -			// 
  -			// usrCommonProject
  +			// wizardPageWelcome
   			// 
  -			this.usrCommonProject.Location = new System.Drawing.Point(12, 79);
  -			this.usrCommonProject.Name = "usrCommonProject";
  -			this.usrCommonProject.ProjectName = "";
  -			this.usrCommonProject.Size = new System.Drawing.Size(384, 156);
  -			this.usrCommonProject.TabIndex = 0;
  +			this.wizardPageWelcome.BackColor = System.Drawing.Color.White;
  +			this.wizardPageWelcome.Controls.Add(this.label9);
  +			this.wizardPageWelcome.Controls.Add(this.label8);
  +			this.wizardPageWelcome.Controls.Add(this.pictureBoxWelcome);
  +			this.wizardPageWelcome.Dock = System.Windows.Forms.DockStyle.Fill;
  +			this.wizardPageWelcome.IsFinishPage = false;
  +			this.wizardPageWelcome.Location = new System.Drawing.Point(0, 0);
  +			this.wizardPageWelcome.Name = "wizardPageWelcome";
  +			this.wizardPageWelcome.Size = new System.Drawing.Size(525, 297);
  +			this.wizardPageWelcome.TabIndex = 1;
   			// 
  -			// header1
  +			// label9
   			// 
  -			this.header1.BackColor = System.Drawing.SystemColors.Control;
  -			this.header1.CausesValidation = false;
  -			this.header1.Description = "The common project contains value objects, enumerations, and other non-entity cla" +
  -				"sses that are generated from your model.";
  -			this.header1.Dock = System.Windows.Forms.DockStyle.Top;
  -			this.header1.Image = ((System.Drawing.Image)(resources.GetObject("header1.Image")));
  -			this.header1.Location = new System.Drawing.Point(0, 0);
  -			this.header1.Name = "header1";
  -			this.header1.Size = new System.Drawing.Size(525, 65);
  -			this.header1.TabIndex = 0;
  -			this.header1.Title = "Common Project";
  +			this.label9.Location = new System.Drawing.Point(174, 61);
  +			this.label9.Name = "label9";
  +			this.label9.Size = new System.Drawing.Size(339, 220);
  +			this.label9.TabIndex = 9;
  +			this.label9.Text = resources.GetString("label9.Text");
   			// 
  -			// wizardPageCoreProject
  +			// label8
   			// 
  -			this.wizardPageCoreProject.Controls.Add(this.header2);
  -			this.wizardPageCoreProject.Controls.Add(this.usrCoreProject);
  -			this.wizardPageCoreProject.Dock = System.Windows.Forms.DockStyle.Fill;
  -			this.wizardPageCoreProject.IsFinishPage = false;
  -			this.wizardPageCoreProject.Location = new System.Drawing.Point(0, 0);
  -			this.wizardPageCoreProject.Name = "wizardPageCoreProject";
  -			this.wizardPageCoreProject.Size = new System.Drawing.Size(525, 297);
  -			this.wizardPageCoreProject.TabIndex = 3;
  -			this.wizardPageCoreProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCoreProject_CloseFromNext);
  -			this.wizardPageCoreProject.ShowFromNext += new System.EventHandler(this.wizardPageCoreProject_ShowFromNext);
  +			this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
  +						| System.Windows.Forms.AnchorStyles.Right)));
  +			this.label8.FlatStyle = System.Windows.Forms.FlatStyle.System;
  +			this.label8.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
  +			this.label8.Location = new System.Drawing.Point(170, 9);
  +			this.label8.Name = "label8";
  +			this.label8.Size = new System.Drawing.Size(304, 48);
  +			this.label8.TabIndex = 8;
  +			this.label8.Text = "Welcome to the AndroMDA Solution Wizard";
   			// 
  -			// header2
  +			// pictureBoxWelcome
   			// 
  -			this.header2.BackColor = System.Drawing.SystemColors.Control;
  -			this.header2.CausesValidation = false;
  -			this.header2.Description = "The core project, also known as the domain project, contains all entities and dat" +
  -				"a access objects generated from your model.";
  -			this.header2.Dock = System.Windows.Forms.DockStyle.Top;
  -			this.header2.Image = ((System.Drawing.Image)(resources.GetObject("header2.Image")));
  -			this.header2.Location = new System.Drawing.Point(0, 0);
  -			this.header2.Name = "header2";
  -			this.header2.Size = new System.Drawing.Size(525, 65);
  -			this.header2.TabIndex = 3;
  -			this.header2.Title = "Core Project";
  +			this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left;
  +			this.pictureBoxWelcome.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWelcome.Image")));
  +			this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0);
  +			this.pictureBoxWelcome.Name = "pictureBoxWelcome";
  +			this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 297);
  +			this.pictureBoxWelcome.TabIndex = 1;
  +			this.pictureBoxWelcome.TabStop = false;
   			// 
  -			// usrCoreProject
  +			// wizardPageComplete
   			// 
  -			this.usrCoreProject.Location = new System.Drawing.Point(12, 79);
  -			this.usrCoreProject.Name = "usrCoreProject";
  -			this.usrCoreProject.ProjectName = "";
  -			this.usrCoreProject.Size = new System.Drawing.Size(384, 156);
  -			this.usrCoreProject.TabIndex = 0;
  +			this.wizardPageComplete.BackColor = System.Drawing.Color.White;
  +			this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle);
  +			this.wizardPageComplete.Controls.Add(this.pictureBoxComplete);
  +			this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription);
  +			this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage);
  +			this.wizardPageComplete.Controls.Add(this.txtErrorMessage);
  +			this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill;
  +			this.wizardPageComplete.IsFinishPage = true;
  +			this.wizardPageComplete.Location = new System.Drawing.Point(0, 0);
  +			this.wizardPageComplete.Name = "wizardPageComplete";
  +			this.wizardPageComplete.Size = new System.Drawing.Size(525, 297);
  +			this.wizardPageComplete.TabIndex = 7;
  +			this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
   			// 
  -			// wizardPageSchemaExportProject
  +			// lblFinishPageTitle
   			// 
  -			this.wizardPageSchemaExportProject.Controls.Add(this.cbCreateSchemaExport);
  -			this.wizardPageSchemaExportProject.Controls.Add(this.txtSchemaExportProject);
  -			this.wizardPageSchemaExportProject.Controls.Add(this.lblDescription);
  -			this.wizardPageSchemaExportProject.Controls.Add(this.header3);
  -			this.wizardPageSchemaExportProject.Dock = System.Windows.Forms.DockStyle.Fill;
  -			this.wizardPageSchemaExportProject.IsFinishPage = false;
  -			this.wizardPageSchemaExportProject.Location = new System.Drawing.Point(0, 0);
  -			this.wizardPageSchemaExportProject.Name = "wizardPageSchemaExportProject";
  -			this.wizardPageSchemaExportProject.Size = new System.Drawing.Size(525, 297);
  -			this.wizardPageSchemaExportProject.TabIndex = 4;
  -			this.wizardPageSchemaExportProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSchemaExportProject_CloseFromNext);
  -			this.wizardPageSchemaExportProject.ShowFromBack += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext);
  -			this.wizardPageSchemaExportProject.ShowFromNext += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext);
  +			this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
  +						| System.Windows.Forms.AnchorStyles.Right)));
  +			this.lblFinishPageTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
  +			this.lblFinishPageTitle.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
  +			this.lblFinishPageTitle.Location = new System.Drawing.Point(209, 9);
  +			this.lblFinishPageTitle.Name = "lblFinishPageTitle";
  +			this.lblFinishPageTitle.Size = new System.Drawing.Size(299, 36);
  +			this.lblFinishPageTitle.TabIndex = 15;
  +			this.lblFinishPageTitle.Text = "Solution Update Complete";
  +			this.lblFinishPageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
   			// 
  -			// cbCreateSchemaExport
  +			// pictureBoxComplete
   			// 
  -			this.cbCreateSchemaExport.AutoSize = true;
  -			this.cbCreateSchemaExport.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
  -			this.cbCreateSchemaExport.Location = new System.Drawing.Point(11, 79);
  -			this.cbCreateSchemaExport.Name = "cbCreateSchemaExport";
  -			this.cbCreateSchemaExport.Size = new System.Drawing.Size(196, 17);
  -			this.cbCreateSchemaExport.TabIndex = 0;
  -			this.cbCreateSchemaExport.Text = "Create schema export project";
  -			this.cbCreateSchemaExport.UseVisualStyleBackColor = true;
  -			this.cbCreateSchemaExport.CheckedChanged += new System.EventHandler(this.cbCreateSchemaExport_CheckedChanged);
  +			this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
  +			this.pictureBoxComplete.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxComplete.Image")));
  +			this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
  +			this.pictureBoxComplete.Name = "pictureBoxComplete";
  +			this.pictureBoxComplete.Size = new System.Drawing.Size(164, 297);
  +			this.pictureBoxComplete.TabIndex = 13;
  +			this.pictureBoxComplete.TabStop = false;
   			// 
  -			// txtSchemaExportProject
  +			// lblFinishPageDescription
   			// 
  -			this.txtSchemaExportProject.Enabled = false;
  -			this.txtSchemaExportProject.Location = new System.Drawing.Point(30, 99);
  -			this.txtSchemaExportProject.Name = "txtSchemaExportProject";
  -			this.txtSchemaExportProject.Size = new System.Drawing.Size(320, 21);
  -			this.txtSchemaExportProject.TabIndex = 1;
  -			this.txtSchemaExportProject.Text = "SchemaExport";
  +			this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49);
  +			this.lblFinishPageDescription.Name = "lblFinishPageDescription";
  +			this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 72);
  +			this.lblFinishPageDescription.TabIndex = 12;
  +			this.lblFinishPageDescription.Text = "Your solution has been updated successfully and now supports AndroMDA code genera" +
  +				"tion.  You can now add classes to the solution model file and generate code base" +
  +				"d on the model.\r\n";
   			// 
  -			// lblDescription
  +			// lblFinishPageTitleImage
   			// 
  -			this.lblDescription.Location = new System.Drawing.Point(13, 92);
  -			this.lblDescription.Name = "lblDescription";
  -			this.lblDescription.Size = new System.Drawing.Size(507, 26);
  -			this.lblDescription.TabIndex = 24;
  +			this.lblFinishPageTitleImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
  +						| System.Windows.Forms.AnchorStyles.Right)));
  +			this.lblFinishPageTitleImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
  +			this.lblFinishPageTitleImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
  +			this.lblFinishPageTitleImage.ImageIndex = 0;
  +			this.lblFinishPageTitleImage.ImageList = this.imageList1;
  +			this.lblFinishPageTitleImage.Location = new System.Drawing.Point(170, 9);
  +			this.lblFinishPageTitleImage.Name = "lblFinishPageTitleImage";
  +			this.lblFinishPageTitleImage.Size = new System.Drawing.Size(49, 36);
  +			this.lblFinishPageTitleImage.TabIndex = 11;
  +			this.lblFinishPageTitleImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
   			// 
  -			// header3
  +			// txtErrorMessage
   			// 
  -			this.header3.BackColor = System.Drawing.SystemColors.Control;
  -			this.header3.CausesValidation = false;
  -			this.header3.Description = "Check the box below if you would like to create a project that contains a console" +
  -				" application that generates database schema from your model. ";
  -			this.header3.Dock = System.Windows.Forms.DockStyle.Top;
  -			this.header3.Image = ((System.Drawing.Image)(resources.GetObject("header3.Image")));
  -			this.header3.Location = new System.Drawing.Point(0, 0);
  -			this.header3.Name = "header3";
  -			this.header3.Size = new System.Drawing.Size(525, 65);
  -			this.header3.TabIndex = 4;
  -			this.header3.Title = "Schema Export Project";
  +			this.txtErrorMessage.BackColor = System.Drawing.Color.White;
  +			this.txtErrorMessage.Location = new System.Drawing.Point(174, 49);
  +			this.txtErrorMessage.Multiline = true;
  +			this.txtErrorMessage.Name = "txtErrorMessage";
  +			this.txtErrorMessage.ReadOnly = true;
  +			this.txtErrorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Both;
  +			this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
  +			this.txtErrorMessage.TabIndex = 14;
   			// 
  -			// wizardPageWebProject
  +			// wizardPageProcessing
   			// 
  -			this.wizardPageWebProject.Controls.Add(this.cbCreateWebProject);
  -			this.wizardPageWebProject.Controls.Add(this.txtWebProject);
  -			this.wizardPageWebProject.Controls.Add(this.header7);
  -			this.wizardPageWebProject.Dock = System.Windows.Forms.DockStyle.Fill;
  -			this.wizardPageWebProject.IsFinishPage = false;
  -			this.wizardPageWebProject.Location = new System.Drawing.Point(0, 0);
  -			this.wizardPageWebProject.Name = "wizardPageWebProject";
  -			this.wizardPageWebProject.Size = new System.Drawing.Size(525, 297);
  -			this.wizardPageWebProject.TabIndex = 9;
  -			this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext);
  -			this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext);
  +			this.wizardPageProcessing.Controls.Add(this.lstStatus);
  +			this.wizardPageProcessing.Controls.Add(this.label7);
  +			this.wizardPageProcessing.Controls.Add(this.header5);
  +			this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill;
  +			this.wizardPageProcessing.IsFinishPage = false;
  +			this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0);
  +			this.wizardPageProcessing.Name = "wizardPageProcessing";
  +			this.wizardPageProcessing.Size = new System.Drawing.Size(525, 297);
  +			this.wizardPageProcessing.TabIndex = 6;
  +			this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
   			// 
  -			// cbCreateWebProject
  +			// lstStatus
   			// 
  -			this.cbCreateWebProject.AutoSize = true;
  -			this.cbCreateWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
  -			this.cbCreateWebProject.Location = new System.Drawing.Point(11, 79);
  -			this.cbCreateWebProject.Name = "cbCreateWebProject";
  -			this.cbCreateWebProject.Size = new System.Drawing.Size(134, 17);
  -			this.cbCreateWebProject.TabIndex = 25;
  -			this.cbCreateWebProject.Text = "Create web project";
  -			this.cbCreateWebProject.UseVisualStyleBackColor = true;
  -			this.cbCreateWebProject.CheckedChanged += new System.EventHandler(this.cbCreateWebProject_CheckedChanged);
  +			this.lstStatus.FormattingEnabled = true;
  +			this.lstStatus.Location = new System.Drawing.Point(12, 100);
  +			this.lstStatus.Name = "lstStatus";
  +			this.lstStatus.Size = new System.Drawing.Size(501, 186);
  +			this.lstStatus.TabIndex = 9;
   			// 
  -			// txtWebProject
  +			// label7
   			// 
  -			this.txtWebProject.Enabled = false;
  -			this.txtWebProject.Location = new System.Drawing.Point(30, 99);
  -			this.txtWebProject.Name = "txtWebProject";
  -			this.txtWebProject.Size = new System.Drawing.Size(320, 21);
  -			this.txtWebProject.TabIndex = 26;
  -			this.txtWebProject.Text = "Web";
  +			this.label7.AutoSize = true;
  +			this.label7.Location = new System.Drawing.Point(12, 77);
  +			this.label7.Name = "label7";
  +			this.label7.Size = new System.Drawing.Size(273, 13);
  +			this.label7.TabIndex = 8;
  +			this.label7.Text = "Updating solution to support AndroMDA.  Please wait...";
   			// 
  -			// header7
  +			// header5
   			// 
  -			this.header7.BackColor = System.Drawing.SystemColors.Control;
  -			this.header7.CausesValidation = false;
  -			this.header7.Description = "Check the box below if you would like to create a web site project that is config" +
  -				"ured to work with NHibernate and your generated objects.";
  -			this.header7.Dock = System.Windows.Forms.DockStyle.Top;
  -			this.header7.Image = ((System.Drawing.Image)(resources.GetObject("header7.Image")));
  -			this.header7.Location = new System.Drawing.Point(0, 0);
  -			this.header7.Name = "header7";
  -			this.header7.Size = new System.Drawing.Size(525, 65);
  -			this.header7.TabIndex = 27;
  -			this.header7.Title = "Web Project";
  +			this.header5.BackColor = System.Drawing.SystemColors.Control;
  +			this.header5.CausesValidation = false;
  +			this.header5.Controls.Add(this.pictureBoxThrobber);
  +			this.header5.Description = "Please wait...";
  +			this.header5.Dock = System.Windows.Forms.DockStyle.Top;
  +			this.header5.Image = ((System.Drawing.Image)(resources.GetObject("header5.Image")));
  +			this.header5.Location = new System.Drawing.Point(0, 0);
  +			this.header5.Name = "header5";
  +			this.header5.Size = new System.Drawing.Size(525, 65);
  +			this.header5.TabIndex = 6;
  +			this.header5.Title = "Processing Solution";
  +			// 
  +			// pictureBoxThrobber
  +			// 
  +			this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
  +			this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
  +			this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
  +			this.pictureBoxThrobber.Name = "pictureBoxThrobber";
  +			this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
  +			this.pictureBoxThrobber.TabIndex = 10;
  +			this.pictureBoxThrobber.TabStop = false;
   			// 
   			// wizardPageConfirmChoices
   			// 
  @@ -641,183 +644,206 @@
   			this.header4.TabIndex = 5;
   			this.header4.Title = "Confirm Choices";
   			// 
  -			// wizardPageWelcome
  +			// wizardPageWebProject
   			// 
  -			this.wizardPageWelcome.BackColor = System.Drawing.Color.White;
  -			this.wizardPageWelcome.Controls.Add(this.label9);
  -			this.wizardPageWelcome.Controls.Add(this.label8);
  -			this.wizardPageWelcome.Controls.Add(this.pictureBoxWelcome);
  -			this.wizardPageWelcome.Dock = System.Windows.Forms.DockStyle.Fill;
  -			this.wizardPageWelcome.IsFinishPage = false;
  -			this.wizardPageWelcome.Location = new System.Drawing.Point(0, 0);
  -			this.wizardPageWelcome.Name = "wizardPageWelcome";
  -			this.wizardPageWelcome.Size = new System.Drawing.Size(525, 297);
  -			this.wizardPageWelcome.TabIndex = 1;
  +			this.wizardPageWebProject.Controls.Add(this.rbWebConfig);
  +			this.wizardPageWebProject.Controls.Add(this.rbNHibernateConfig);
  +			this.wizardPageWebProject.Controls.Add(this.cbCreateWebProject);
  +			this.wizardPageWebProject.Controls.Add(this.txtWebProject);
  +			this.wizardPageWebProject.Controls.Add(this.header7);
  +			this.wizardPageWebProject.Dock = System.Windows.Forms.DockStyle.Fill;
  +			this.wizardPageWebProject.IsFinishPage = false;
  +			this.wizardPageWebProject.Location = new System.Drawing.Point(0, 0);
  +			this.wizardPageWebProject.Name = "wizardPageWebProject";
  +			this.wizardPageWebProject.Size = new System.Drawing.Size(525, 297);
  +			this.wizardPageWebProject.TabIndex = 9;
  +			this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext);
  +			this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext);
   			// 
  -			// label9
  +			// cbCreateWebProject
   			// 
  -			this.label9.Location = new System.Drawing.Point(174, 61);
  -			this.label9.Name = "label9";
  -			this.label9.Size = new System.Drawing.Size(339, 220);
  -			this.label9.TabIndex = 9;
  -			this.label9.Text = resources.GetString("label9.Text");
  +			this.cbCreateWebProject.AutoSize = true;
  +			this.cbCreateWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
  +			this.cbCreateWebProject.Location = new System.Drawing.Point(11, 79);
  +			this.cbCreateWebProject.Name = "cbCreateWebProject";
  +			this.cbCreateWebProject.Size = new System.Drawing.Size(134, 17);
  +			this.cbCreateWebProject.TabIndex = 25;
  +			this.cbCreateWebProject.Text = "Create web project";
  +			this.cbCreateWebProject.UseVisualStyleBackColor = true;
  +			this.cbCreateWebProject.CheckedChanged += new System.EventHandler(this.cbCreateWebProject_CheckedChanged);
   			// 
  -			// label8
  +			// txtWebProject
   			// 
  -			this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
  -						| System.Windows.Forms.AnchorStyles.Right)));
  -			this.label8.FlatStyle = System.Windows.Forms.FlatStyle.System;
  -			this.label8.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
  -			this.label8.Location = new System.Drawing.Point(170, 9);
  -			this.label8.Name = "label8";
  -			this.label8.Size = new System.Drawing.Size(304, 48);
  -			this.label8.TabIndex = 8;
  -			this.label8.Text = "Welcome to the AndroMDA Solution Wizard";
  +			this.txtWebProject.Enabled = false;
  +			this.txtWebProject.Location = new System.Drawing.Point(30, 99);
  +			this.txtWebProject.Name = "txtWebProject";
  +			this.txtWebProject.Size = new System.Drawing.Size(320, 21);
  +			this.txtWebProject.TabIndex = 26;
  +			this.txtWebProject.Text = "Web";
   			// 
  -			// pictureBoxWelcome
  +			// header7
   			// 
  -			this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left;
  -			this.pictureBoxWelcome.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWelcome.Image")));
  -			this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0);
  -			this.pictureBoxWelcome.Name = "pictureBoxWelcome";
  -			this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 297);
  -			this.pictureBoxWelcome.TabIndex = 1;
  -			this.pictureBoxWelcome.TabStop = false;
  +			this.header7.BackColor = System.Drawing.SystemColors.Control;
  +			this.header7.CausesValidation = false;
  +			this.header7.Description = "Check the box below if you would like to create a web site project that is config" +
  +				"ured to work with NHibernate and your generated objects.";
  +			this.header7.Dock = System.Windows.Forms.DockStyle.Top;
  +			this.header7.Image = ((System.Drawing.Image)(resources.GetObject("header7.Image")));
  +			this.header7.Location = new System.Drawing.Point(0, 0);
  +			this.header7.Name = "header7";
  +			this.header7.Size = new System.Drawing.Size(525, 65);
  +			this.header7.TabIndex = 27;
  +			this.header7.Title = "Web Project";
   			// 
  -			// wizardPageComplete
  +			// wizardPageSchemaExportProject
   			// 
  -			this.wizardPageComplete.BackColor = System.Drawing.Color.White;
  -			this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle);
  -			this.wizardPageComplete.Controls.Add(this.pictureBoxComplete);
  -			this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription);
  -			this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage);
  -			this.wizardPageComplete.Controls.Add(this.txtErrorMessage);
  -			this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill;
  -			this.wizardPageComplete.IsFinishPage = true;
  -			this.wizardPageComplete.Location = new System.Drawing.Point(0, 0);
  -			this.wizardPageComplete.Name = "wizardPageComplete";
  -			this.wizardPageComplete.Size = new System.Drawing.Size(525, 297);
  -			this.wizardPageComplete.TabIndex = 7;
  -			this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
  +			this.wizardPageSchemaExportProject.Controls.Add(this.cbCreateSchemaExport);
  +			this.wizardPageSchemaExportProject.Controls.Add(this.txtSchemaExportProject);
  +			this.wizardPageSchemaExportProject.Controls.Add(this.lblDescription);
  +			this.wizardPageSchemaExportProject.Controls.Add(this.header3);
  +			this.wizardPageSchemaExportProject.Dock = System.Windows.Forms.DockStyle.Fill;
  +			this.wizardPageSchemaExportProject.IsFinishPage = false;
  +			this.wizardPageSchemaExportProject.Location = new System.Drawing.Point(0, 0);
  +			this.wizardPageSchemaExportProject.Name = "wizardPageSchemaExportProject";
  +			this.wizardPageSchemaExportProject.Size = new System.Drawing.Size(525, 297);
  +			this.wizardPageSchemaExportProject.TabIndex = 4;
  +			this.wizardPageSchemaExportProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSchemaExportProject_CloseFromNext);
  +			this.wizardPageSchemaExportProject.ShowFromBack += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext);
  +			this.wizardPageSchemaExportProject.ShowFromNext += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext);
   			// 
  -			// lblFinishPageTitle
  +			// cbCreateSchemaExport
   			// 
  -			this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
  -						| System.Windows.Forms.AnchorStyles.Right)));
  -			this.lblFinishPageTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
  -			this.lblFinishPageTitle.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
  -			this.lblFinishPageTitle.Location = new System.Drawing.Point(209, 9);
  -			this.lblFinishPageTitle.Name = "lblFinishPageTitle";
  -			this.lblFinishPageTitle.Size = new System.Drawing.Size(299, 36);
  -			this.lblFinishPageTitle.TabIndex = 15;
  -			this.lblFinishPageTitle.Text = "Solution Update Complete";
  -			this.lblFinishPageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
  +			this.cbCreateSchemaExport.AutoSize = true;
  +			this.cbCreateSchemaExport.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
  +			this.cbCreateSchemaExport.Location = new System.Drawing.Point(11, 79);
  +			this.cbCreateSchemaExport.Name = "cbCreateSchemaExport";
  +			this.cbCreateSchemaExport.Size = new System.Drawing.Size(196, 17);
  +			this.cbCreateSchemaExport.TabIndex = 0;
  +			this.cbCreateSchemaExport.Text = "Create schema export project";
  +			this.cbCreateSchemaExport.UseVisualStyleBackColor = true;
  +			this.cbCreateSchemaExport.CheckedChanged += new System.EventHandler(this.cbCreateSchemaExport_CheckedChanged);
   			// 
  -			// pictureBoxComplete
  +			// txtSchemaExportProject
   			// 
  -			this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
  -			this.pictureBoxComplete.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxComplete.Image")));
  -			this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
  -			this.pictureBoxComplete.Name = "pictureBoxComplete";
  -			this.pictureBoxComplete.Size = new System.Drawing.Size(164, 297);
  -			this.pictureBoxComplete.TabIndex = 13;
  -			this.pictureBoxComplete.TabStop = false;
  +			this.txtSchemaExportProject.Enabled = false;
  +			this.txtSchemaExportProject.Location = new System.Drawing.Point(30, 99);
  +			this.txtSchemaExportProject.Name = "txtSchemaExportProject";
  +			this.txtSchemaExportProject.Size = new System.Drawing.Size(320, 21);
  +			this.txtSchemaExportProject.TabIndex = 1;
  +			this.txtSchemaExportProject.Text = "SchemaExport";
   			// 
  -			// lblFinishPageDescription
  +			// lblDescription
   			// 
  -			this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49);
  -			this.lblFinishPageDescription.Name = "lblFinishPageDescription";
  -			this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 72);
  -			this.lblFinishPageDescription.TabIndex = 12;
  -			this.lblFinishPageDescription.Text = "Your solution has been updated successfully and now supports AndroMDA code genera" +
  -				"tion.  You can now add classes to the solution model file and generate code base" +
  -				"d on the model.\r\n";
  +			this.lblDescription.Location = new System.Drawing.Point(13, 92);
  +			this.lblDescription.Name = "lblDescription";
  +			this.lblDescription.Size = new System.Drawing.Size(507, 26);
  +			this.lblDescription.TabIndex = 24;
   			// 
  -			// lblFinishPageTitleImage
  +			// header3
   			// 
  -			this.lblFinishPageTitleImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
  -						| System.Windows.Forms.AnchorStyles.Right)));
  -			this.lblFinishPageTitleImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
  -			this.lblFinishPageTitleImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
  -			this.lblFinishPageTitleImage.ImageIndex = 0;
  -			this.lblFinishPageTitleImage.ImageList = this.imageList1;
  -			this.lblFinishPageTitleImage.Location = new System.Drawing.Point(170, 9);
  -			this.lblFinishPageTitleImage.Name = "lblFinishPageTitleImage";
  -			this.lblFinishPageTitleImage.Size = new System.Drawing.Size(49, 36);
  -			this.lblFinishPageTitleImage.TabIndex = 11;
  -			this.lblFinishPageTitleImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
  +			this.header3.BackColor = System.Drawing.SystemColors.Control;
  +			this.header3.CausesValidation = false;
  +			this.header3.Description = "Check the box below if you would like to create a project that contains a console" +
  +				" application that generates database schema from your model. ";
  +			this.header3.Dock = System.Windows.Forms.DockStyle.Top;
  +			this.header3.Image = ((System.Drawing.Image)(resources.GetObject("header3.Image")));
  +			this.header3.Location = new System.Drawing.Point(0, 0);
  +			this.header3.Name = "header3";
  +			this.header3.Size = new System.Drawing.Size(525, 65);
  +			this.header3.TabIndex = 4;
  +			this.header3.Title = "Schema Export Project";
   			// 
  -			// imageList1
  +			// wizardPageCoreProject
   			// 
  -			this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
  -			this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
  -			this.imageList1.Images.SetKeyName(0, "INFO.ICO");
  -			this.imageList1.Images.SetKeyName(1, "error.ico");
  +			this.wizardPageCoreProject.Controls.Add(this.header2);
  +			this.wizardPageCoreProject.Controls.Add(this.usrCoreProject);
  +			this.wizardPageCoreProject.Dock = System.Windows.Forms.DockStyle.Fill;
  +			this.wizardPageCoreProject.IsFinishPage = false;
  +			this.wizardPageCoreProject.Location = new System.Drawing.Point(0, 0);
  +			this.wizardPageCoreProject.Name = "wizardPageCoreProject";
  +			this.wizardPageCoreProject.Size = new System.Drawing.Size(525, 297);
  +			this.wizardPageCoreProject.TabIndex = 3;
  +			this.wizardPageCoreProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCoreProject_CloseFromNext);
  +			this.wizardPageCoreProject.ShowFromNext += new System.EventHandler(this.wizardPageCoreProject_ShowFromNext);
   			// 
  -			// txtErrorMessage
  +			// header2
   			// 
  -			this.txtErrorMessage.BackColor = System.Drawing.Color.White;
  -			this.txtErrorMessage.Location = new System.Drawing.Point(174, 49);
  -			this.txtErrorMessage.Multiline = true;
  -			this.txtErrorMessage.Name = "txtErrorMessage";
  -			this.txtErrorMessage.ReadOnly = true;
  -			this.txtErrorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Both;
  -			this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
  -			this.txtErrorMessage.TabIndex = 14;
  +			this.header2.BackColor = System.Drawing.SystemColors.Control;
  +			this.header2.CausesValidation = false;
  +			this.header2.Description = "The core project, also known as the domain project, contains all entities and dat" +
  +				"a access objects generated from your model.";
  +			this.header2.Dock = System.Windows.Forms.DockStyle.Top;
  +			this.header2.Image = ((System.Drawing.Image)(resources.GetObject("header2.Image")));
  +			this.header2.Location = new System.Drawing.Point(0, 0);
  +			this.header2.Name = "header2";
  +			this.header2.Size = new System.Drawing.Size(525, 65);
  +			this.header2.TabIndex = 3;
  +			this.header2.Title = "Core Project";
   			// 
  -			// wizardPageProcessing
  +			// usrCoreProject
   			// 
  -			this.wizardPageProcessing.Controls.Add(this.lstStatus);
  -			this.wizardPageProcessing.Controls.Add(this.label7);
  -			this.wizardPageProcessing.Controls.Add(this.header5);
  -			this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill;
  -			this.wizardPageProcessing.IsFinishPage = false;
  -			this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0);
  -			this.wizardPageProcessing.Name = "wizardPageProcessing";
  -			this.wizardPageProcessing.Size = new System.Drawing.Size(525, 297);
  -			this.wizardPageProcessing.TabIndex = 6;
  -			this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
  +			this.usrCoreProject.Location = new System.Drawing.Point(12, 79);
  +			this.usrCoreProject.Name = "usrCoreProject";
  +			this.usrCoreProject.ProjectName = "";
  +			this.usrCoreProject.Size = new System.Drawing.Size(384, 156);
  +			this.usrCoreProject.TabIndex = 0;
   			// 
  -			// lstStatus
  +			// wizardPageCommonProject
   			// 
  -			this.lstStatus.FormattingEnabled = true;
  -			this.lstStatus.Location = new System.Drawing.Point(12, 100);
  -			this.lstStatus.Name = "lstStatus";
  -			this.lstStatus.Size = new System.Drawing.Size(501, 186);
  -			this.lstStatus.TabIndex = 9;
  +			this.wizardPageCommonProject.Controls.Add(this.usrCommonProject);
  +			this.wizardPageCommonProject.Controls.Add(this.header1);
  +			this.wizardPageCommonProject.Dock = System.Windows.Forms.DockStyle.Fill;
  +			this.wizardPageCommonProject.IsFinishPage = false;
  +			this.wizardPageCommonProject.Location = new System.Drawing.Point(0, 0);
  +			this.wizardPageCommonProject.Name = "wizardPageCommonProject";
  +			this.wizardPageCommonProject.Size = new System.Drawing.Size(525, 297);
  +			this.wizardPageCommonProject.TabIndex = 2;
  +			this.wizardPageCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCommonProject_CloseFromNext);
  +			this.wizardPageCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageCommonProject_ShowFromNext);
   			// 
  -			// label7
  +			// usrCommonProject
   			// 
  -			this.label7.AutoSize = true;
  -			this.label7.Location = new System.Drawing.Point(12, 77);
  -			this.label7.Name = "label7";
  -			this.label7.Size = new System.Drawing.Size(273, 13);
  -			this.label7.TabIndex = 8;
  -			this.label7.Text = "Updating solution to support AndroMDA.  Please wait...";
  +			this.usrCommonProject.Location = new System.Drawing.Point(12, 79);
  +			this.usrCommonProject.Name = "usrCommonProject";
  +			this.usrCommonProject.ProjectName = "";
  +			this.usrCommonProject.Size = new System.Drawing.Size(384, 156);
  +			this.usrCommonProject.TabIndex = 0;
   			// 
  -			// header5
  +			// header1
   			// 
  -			this.header5.BackColor = System.Drawing.SystemColors.Control;
  -			this.header5.CausesValidation = false;
  -			this.header5.Controls.Add(this.pictureBoxThrobber);
  -			this.header5.Description = "Please wait...";
  -			this.header5.Dock = System.Windows.Forms.DockStyle.Top;
  -			this.header5.Image = ((System.Drawing.Image)(resources.GetObject("header5.Image")));
  -			this.header5.Location = new System.Drawing.Point(0, 0);
  -			this.header5.Name = "header5";
  -			this.header5.Size = new System.Drawing.Size(525, 65);
  -			this.header5.TabIndex = 6;
  -			this.header5.Title = "Processing Solution";
  +			this.header1.BackColor = System.Drawing.SystemColors.Control;
  +			this.header1.CausesValidation = false;
  +			this.header1.Description = "The common project contains value objects, enumerations, and other non-entity cla" +
  +				"sses that are generated from your model.";
  +			this.header1.Dock = System.Windows.Forms.DockStyle.Top;
  +			this.header1.Image = ((System.Drawing.Image)(resources.GetObject("header1.Image")));
  +			this.header1.Location = new System.Drawing.Point(0, 0);
  +			this.header1.Name = "header1";
  +			this.header1.Size = new System.Drawing.Size(525, 65);
  +			this.header1.TabIndex = 0;
  +			this.header1.Title = "Common Project";
   			// 
  -			// pictureBoxThrobber
  +			// rbNHibernateConfig
   			// 
  -			this.pictureBoxThrobber.BackColor = System.Drawing.Color.White;
  -			this.pictureBoxThrobber.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxThrobber.Image")));
  -			this.pictureBoxThrobber.Location = new System.Drawing.Point(8, 40);
  -			this.pictureBoxThrobber.Name = "pictureBoxThrobber";
  -			this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 22);
  -			this.pictureBoxThrobber.TabIndex = 10;
  -			this.pictureBoxThrobber.TabStop = false;
  +			this.rbNHibernateConfig.AutoSize = true;
  +			this.rbNHibernateConfig.Checked = true;
  +			this.rbNHibernateConfig.Location = new System.Drawing.Point(30, 126);
  +			this.rbNHibernateConfig.Name = "rbNHibernateConfig";
  +			this.rbNHibernateConfig.Size = new System.Drawing.Size(249, 17);
  +			this.rbNHibernateConfig.TabIndex = 28;
  +			this.rbNHibernateConfig.TabStop = true;
  +			this.rbNHibernateConfig.Text = "Store persistance settings in nhibernate.config";
  +			this.rbNHibernateConfig.UseVisualStyleBackColor = true;
  +			// 
  +			// rbWebConfig
  +			// 
  +			this.rbWebConfig.AutoSize = true;
  +			this.rbWebConfig.Location = new System.Drawing.Point(30, 149);
  +			this.rbWebConfig.Name = "rbWebConfig";
  +			this.rbWebConfig.Size = new System.Drawing.Size(217, 17);
  +			this.rbWebConfig.TabIndex = 29;
  +			this.rbWebConfig.Text = "Store persistance settings in web.config";
  +			this.rbWebConfig.UseVisualStyleBackColor = true;
   			// 
   			// MDASolutionWizard
   			// 
  @@ -836,14 +862,6 @@
   			this.wizard1.ResumeLayout(false);
   			this.wizardPageSolutionInfo.ResumeLayout(false);
   			this.wizardPageSolutionInfo.PerformLayout();
  -			this.wizardPageCommonProject.ResumeLayout(false);
  -			this.wizardPageCoreProject.ResumeLayout(false);
  -			this.wizardPageSchemaExportProject.ResumeLayout(false);
  -			this.wizardPageSchemaExportProject.PerformLayout();
  -			this.wizardPageWebProject.ResumeLayout(false);
  -			this.wizardPageWebProject.PerformLayout();
  -			this.wizardPageConfirmChoices.ResumeLayout(false);
  -			this.wizardPageConfirmChoices.PerformLayout();
   			this.wizardPageWelcome.ResumeLayout(false);
   			((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).EndInit();
   			this.wizardPageComplete.ResumeLayout(false);
  @@ -853,6 +871,14 @@
   			this.wizardPageProcessing.PerformLayout();
   			this.header5.ResumeLayout(false);
   			((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).EndInit();
  +			this.wizardPageConfirmChoices.ResumeLayout(false);
  +			this.wizardPageConfirmChoices.PerformLayout();
  +			this.wizardPageWebProject.ResumeLayout(false);
  +			this.wizardPageWebProject.PerformLayout();
  +			this.wizardPageSchemaExportProject.ResumeLayout(false);
  +			this.wizardPageSchemaExportProject.PerformLayout();
  +			this.wizardPageCoreProject.ResumeLayout(false);
  +			this.wizardPageCommonProject.ResumeLayout(false);
   			this.ResumeLayout(false);
   
           }
  @@ -921,5 +947,7 @@
   		private System.Windows.Forms.Label lblFinishPageTitle;
   		private System.Windows.Forms.ComboBox ddlVersionControl;
   		private System.Windows.Forms.Label label1;
  +		private System.Windows.Forms.RadioButton rbWebConfig;
  +		private System.Windows.Forms.RadioButton rbNHibernateConfig;
       }
   }
  \ No newline at end of file
  
  
  
  1.4       +2191 -2191plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.resx
  
  Index: MDASolutionWizard.resx
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/MDASolutionWizard.resx,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- MDASolutionWizard.resx	28 May 2006 05:54:02 -0000	1.3
  +++ MDASolutionWizard.resx	28 May 2006 15:49:55 -0000	1.4
  @@ -117,8 +117,151 @@
     <resheader name="writer">
       <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
  +  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  +    <value>17, 17</value>
  +  </metadata>
  +  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
  +    <value>
  +        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
  +        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
  +        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAY
  +        HwAAAk1TRnQBSQFMAgEBAgEAAQQBAAEEAQABIAEAASABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAGA
  +        AwABIAMAAQEBAAEYBgABMEsAAVABIgE0ATkBBAEZPAAB0QIAAbECAAGHAgABYAIAAUICAAEzAgABLAIA
  +        ASsCAAEtAgABMwIAAUICAAFhAgABhQIAAa8CAAHQ/wARAAHCAY8BYwF6AUMBMgE5AQQBGTkAAbcCAAF1
  +        AgABNgEAARUBCQEAAUQCAQFdAgEBbAIAAXQCAAF1AgABbAIBAV4CAQFFAgABIAEKAQABAQEbAgABQwIA
  +        AXoCAAG0/wALAAHLAZ8BcgHbAa8BgwF6AUMBMgE5AQQBGTYAAY0CAAExAQEBLwIBAXUCAQGGAgEBiQIA
  +        AYUCAA...
 
[truncated message content]