Menu
▾
▴
[Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda cvsignore
|
From: Chris M. <cm...@us...> - 2006-05-28 05:54:07
|
User: cmicali
Date: 06/05/27 22:54:04
Modified: 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/Utils
VSSolutionUtils.cs
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Common
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Core
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/SchemaExport
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web/Bin
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda
cvsignore
Log:
- Added source control .cvsignore/.svnignore output to solution wizard
Revision Changes Path
1.9 +7 -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.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- AndroMDA.VS80AddIn.csproj 27 May 2006 22:31:46 -0000 1.8
+++ AndroMDA.VS80AddIn.csproj 28 May 2006 05:54:01 -0000 1.9
@@ -272,7 +272,11 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="AddIn.ico" />
+ <None Include="Resources\Common\cvsignore" />
+ <None Include="Resources\Core\cvsignore" />
+ <None Include="Resources\cvsignore" />
<None Include="Resources\maven.xml" />
+ <None Include="Resources\mda\cvsignore" />
<None Include="Resources\project.properties" />
<None Include="Resources\project.xml" />
<None Include="Resources\mda\maven.xml" />
@@ -283,6 +287,7 @@
<None Include="Resources\Common\project.xml" />
<None Include="Resources\Core\project.xml" />
<None Include="Resources\SchemaExport\App.config" />
+ <None Include="Resources\SchemaExport\cvsignore" />
<None Include="Resources\SchemaExport\nhibernate.config" />
<None Include="Resources\SchemaExport\Program.cs" />
<None Include="Resources\Lib\AndroMDA.NHibernateSupport.dll" />
@@ -295,6 +300,8 @@
<None Include="Resources\Lib\NHibernate.Caches.SysCache.dll" />
<None Include="Resources\Lib\NHibernate.dll" />
<None Include="Resources\Lib\NHibernate.Nullables2.dll" />
+ <None Include="Resources\Web\Bin\cvsignore" />
+ <None Include="Resources\Web\cvsignore" />
</ItemGroup>
<ItemGroup>
<Folder Include="MavenProxy\" />
1.3 +86 -13 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Resource1.Designer.cs 18 Apr 2006 17:18:51 -0000 1.2
+++ Resource1.Designer.cs 28 May 2006 05:54:01 -0000 1.3
@@ -61,6 +61,18 @@
}
/// <summary>
+ /// Looks up a localized string similar to bin
+ ///obj
+ ///target
+ ///*.user.
+ /// </summary>
+ internal static string common_cvsignore {
+ get {
+ return ResourceManager.GetString("common_cvsignore", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?>
///
///<project>
@@ -80,6 +92,18 @@
}
/// <summary>
+ /// Looks up a localized string similar to bin
+ ///obj
+ ///target
+ ///*.user.
+ /// </summary>
+ internal static string core_cvsignore {
+ get {
+ return ResourceManager.GetString("core_cvsignore", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?>
///
///<project>
@@ -98,6 +122,19 @@
}
}
+ /// <summary>
+ /// Looks up a localized string similar to *.suo
+ ///*.log
+ ///PrecompiledWeb
+ ///target
+ ///.
+ /// </summary>
+ internal static string cvsignore {
+ get {
+ return ResourceManager.GetString("cvsignore", resourceCulture);
+ }
+ }
+
internal static byte[] lib_AndroMDA_NHibernateSupport_dll {
get {
object obj = ResourceManager.GetObject("lib_AndroMDA_NHibernateSupport_dll", resourceCulture);
@@ -183,7 +220,7 @@
/// ================================================================== -->
/// <goal name="clean">
/// <attainGoal name="multiproject:clean"/>
- /// <!-- get rid of a [rest of string was truncated]";.
+ /// <!- [rest of string was truncated]";.
/// </summary>
internal static string maven_xml {
get {
@@ -216,6 +253,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to vsmdaaddin.properties.
+ /// </summary>
+ internal static string mda_cvsignore {
+ get {
+ return ResourceManager.GetString("mda_cvsignore", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to <project default="pom:install">
/// <preGoal name="pom:install">
/// <attainGoal name="andromda:run"/>
@@ -241,8 +287,7 @@
///maven.andromda.run.without.ant=true
///
///# Define the assembly names for Common and Core projects
- ///maven.andromda.commonAssemblyName=${wizard.projects.common.name}
- ///maven. [rest of string was truncated]";.
+ ///maven.andromda.commonAssemblyName=${wizard.projects.common.n [rest of string was truncated]";.
/// </summary>
internal static string mda_project_properties {
get {
@@ -264,8 +309,7 @@
/// <groupId>andromda</groupId>
/// <artifactId>andromda-profile</artifactId>
/// <version>${andromda.version}</version>
- /// <type>xml.zip</type>
- /// [rest of string was truncated]";.
+ /// <type>xml.zi [rest of string was truncated]";.
/// </summary>
internal static string mda_project_xml {
get {
@@ -286,7 +330,7 @@
/// <XMI.metamodel xmi.name='UML' xmi.version='1.4'/>
/// </XMI.header>
/// <XMI.content>
- /// <UML:Model xmi.id='eee_1045467100313_135436_1' name='Data' isRoot='false' isLeaf='false' isA [rest of string was truncated]";.
+ /// <UML:Model xmi.id='eee_1045467100313_135436_1' name='Data' isRoot='false' isLeaf [rest of string was truncated]";.
/// </summary>
internal static string mda_src_uml_empty_model_xml {
get {
@@ -306,8 +350,7 @@
///# For SQL Server use: net.sf.hibernate.dialect.SQLServerDialect
///# For MySql use: net.sf.hibernate.dialect.MySQLDialect
///# For Hypersonic use: net.sf.hibernate.dialect.HSQLDialect
- ///# For Oracle9i use: net.sf.hibernate.dialect.Oracle9Dialect
- ///h [rest of string was truncated]";.
+ ///# For Oracle9i use: net.sf.hibernate.dialect.Oracl [rest of string was truncated]";.
/// </summary>
internal static string project_properties {
get {
@@ -331,7 +374,7 @@
/// <developers>
/// </developers>
/// <dependencies>
- /// <dependen [rest of string was truncated]";.
+ /// [rest of string was truncated]";.
/// </summary>
internal static string project_xml {
get {
@@ -353,7 +396,7 @@
/// <rollingStyle value="Size" />
/// <maxSizeRollBackups value="10" />
/// <maximumFileSize value="1MB" />
- /// <staticLogFileName value="true" / [rest of string was truncated]";.
+ /// <staticLogFileName v [rest of string was truncated]";.
/// </summary>
internal static string SchemaExport_App_config {
get {
@@ -362,6 +405,17 @@
}
/// <summary>
+ /// Looks up a localized string similar to bin
+ ///obj
+ ///*.user.
+ /// </summary>
+ internal static string SchemaExport_cvsignore {
+ get {
+ return ResourceManager.GetString("SchemaExport_cvsignore", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?>
///<hibernate-configuration xmlns="urn:nhibernate-configuration-2.0" >
/// <session-factory name="nhibernator">
@@ -369,7 +423,7 @@
/// <property name="hibernate.connection.provider">NHibernate.Connection.DriverConnectionProvider</property>
/// <property name="hibernate.dialect">${wizard.database.nhibernatedialect}</property>
/// <property name="hibernate.connection.driver_class">${wizard.hibernate.connection.driver_class}</property>
- /// <propert [rest of string was truncated]";.
+ /// < [rest of string was truncated]";.
/// </summary>
internal static string SchemaExport_nhibernate_config {
get {
@@ -393,12 +447,31 @@
/// Console.WriteLine("Usage:");
/// Console.WriteLine(" SchemaExport [script] [export]");
/// Console.WriteLine(" script=t outputs DDL to the console");
- /// Console.WriteLine(" export=t exports schema [rest of string was truncated]";.
+ /// Console.WriteLine(" export=t [rest of string was truncated]";.
/// </summary>
internal static string SchemaExport_Program_cs {
get {
return ResourceManager.GetString("SchemaExport_Program_cs", resourceCulture);
}
}
+
+ /// <summary>
+ /// Looks up a localized string similar to *.dll
+ ///*.pdb.
+ /// </summary>
+ internal static string web_bin_cvsignore {
+ get {
+ return ResourceManager.GetString("web_bin_cvsignore", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to App_WebReferences.
+ /// </summary>
+ internal static string web_cvsignore {
+ get {
+ return ResourceManager.GetString("web_cvsignore", resourceCulture);
+ }
+ }
}
}
1.3 +21 -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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Resource1.resx 18 Apr 2006 17:18:51 -0000 1.2
+++ Resource1.resx 28 May 2006 05:54:01 -0000 1.3
@@ -118,12 +118,21 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="common_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Common\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name="common_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Common\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
+ <data name="core_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Core\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name="core_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Core\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
+ <data name="cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name="lib_AndroMDA_NHibernateSupport_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\AndroMDA.NHibernateSupport.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -160,6 +169,9 @@
<data name="mda_conf_andromda_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mda\conf\andromda.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
+ <data name="mda_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\mda\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name="mda_maven_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mda\maven.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
@@ -181,10 +193,19 @@
<data name="SchemaExport_App_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\SchemaExport\App.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
+ <data name="SchemaExport_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\SchemaExport\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name="SchemaExport_nhibernate_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\SchemaExport\nhibernate.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="SchemaExport_Program_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\SchemaExport\Program.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
+ <data name="web_bin_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Web\Bin\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <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>
</root>
\ No newline at end of file
1.4 +57 -26 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- WizardSolutionProcessor.cs 27 May 2006 22:31:46 -0000 1.3
+++ WizardSolutionProcessor.cs 28 May 2006 05:54:01 -0000 1.4
@@ -94,6 +94,19 @@
Project schemaExportProject = null;
Project webProject = null;
+ string versionControlType = m_configuration["application.versioncontrol"];
+ bool versionControl = versionControlType != "None";
+ string ignoreFile = string.Empty;
+ switch (versionControlType)
+ {
+ case "CVS":
+ ignoreFile = ".cvsignore";
+ break;
+ case "Subversion":
+ ignoreFile = ".svnignore";
+ break;
+ }
+
// Create/find the common project
if (m_configuration["projects.common.create"] == "true")
{
@@ -106,14 +119,17 @@
commonProject = VSSolutionUtils.FindProjectByName(m_configuration["projects.common.name"], m_applicationObject.Solution);
}
- //CreateDirectory(basePath + "\\" + m_configuration["projects.common.dir"] + "\\src");
- //CreateDirectory(basePath + "\\" + m_configuration["projects.common.dir"] + "\\target");
commonProject.ProjectItems.AddFolder("src", Constants.vsProjectItemKindPhysicalFolder);
commonProject.ProjectItems.AddFolder("target", Constants.vsProjectItemKindPhysicalFolder);
-
WriteFile(basePath + "\\" + m_configuration["projects.common.dir"] + "\\project.xml", ParseVariables(Resource1.common_project_xml));
- // Create/find the common project
+ // Write common/cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\" + m_configuration["projects.common.dir"] + "\\" + ignoreFile, ParseVariables(Resource1.common_cvsignore));
+ }
+
+ // Create/find the core project
if (m_configuration["projects.core.create"] == "true")
{
AddToStatus("Creating core project " + m_configuration["projects.core.name"] + "...");
@@ -124,11 +140,15 @@
AddToStatus("Using existing core project " + m_configuration["projects.core.name"] + "...");
coreProject = VSSolutionUtils.FindProjectByName(m_configuration["projects.core.name"], m_applicationObject.Solution);
}
- //CreateDirectory(basePath + "\\" + m_configuration["projects.core.dir"] + "\\src");
- //CreateDirectory(basePath + "\\" + m_configuration["projects.core.dir"] + "\\target");
coreProject.ProjectItems.AddFolder("src", Constants.vsProjectItemKindPhysicalFolder);
coreProject.ProjectItems.AddFolder("target", Constants.vsProjectItemKindPhysicalFolder);
WriteFile(basePath + "\\" + m_configuration["projects.core.dir"] + "\\project.xml", ParseVariables(Resource1.core_project_xml));
+ // Write core/cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\" + m_configuration["projects.core.dir"] + "\\" + ignoreFile, ParseVariables(Resource1.core_cvsignore));
+ }
+
// Create the schema export project
if (m_configuration["projects.schemaexport.create"] == "true")
@@ -148,30 +168,29 @@
nhibernateConfig.Properties.Item("BuildAction").Value = VSLangProj.prjBuildAction.prjBuildActionContent;
schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\Program.cs");
+
+ // Write SchemaExport/cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\" + ignoreFile, ParseVariables(Resource1.SchemaExport_cvsignore));
+ }
}
- // Create the schema export project
+ // Create the web project
if (m_configuration["projects.web.create"] == "true")
{
AddToStatus("Creating web project " + m_configuration["projects.web.name"] + "...");
webProject = VSSolutionUtils.AddWebProjectToSolution(m_configuration["projects.web.name"], (Solution2)m_applicationObject.Solution);
- /*
- WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\App.config", ParseVariables(Resource1.SchemaExport_App_config));
- WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\nhibernate.config", ParseVariables(Resource1.SchemaExport_nhibernate_config));
- WriteFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\Program.cs", ParseVariables(Resource1.SchemaExport_Program_cs));
- ProjectItem appConfig = schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\App.config");
- ProjectItem nhibernateConfig = schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\nhibernate.config");
-
- // Set the config files 'Copy to Output Directory' property to 'Copy if Newer'
- appConfig.Properties.Item("CopyToOutputDirectory").Value = 2;
- appConfig.Properties.Item("BuildAction").Value = VSLangProj.prjBuildAction.prjBuildActionContent;
- nhibernateConfig.Properties.Item("CopyToOutputDirectory").Value = 2;
- nhibernateConfig.Properties.Item("BuildAction").Value = VSLangProj.prjBuildAction.prjBuildActionContent;
-
- schemaExportProject.ProjectItems.AddFromFile(basePath + "\\" + m_configuration["projects.schemaexport.dir"] + "\\Program.cs");
- */
+ // Write Web/cvsignore and Web\Bin\cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\" + ignoreFile, ParseVariables(Resource1.web_cvsignore));
+ CreateDirectory(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Bin");
+ WriteFile(basePath + "\\" + m_configuration["projects.web.dir"] + "\\Bin\\" + ignoreFile, ParseVariables(Resource1.web_bin_cvsignore));
+ }
}
+ AddToStatus("Creating AndroMDA configuration files...");
// Render /maven.xml
WriteFile(basePath + "\\maven.xml", ParseVariables(Resource1.maven_xml));
// Render /project.properties
@@ -179,6 +198,12 @@
// Render /project.xml
WriteFile(basePath + "\\project.xml", ParseVariables(Resource1.project_xml));
+ // Render /cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\" + ignoreFile, ParseVariables(Resource1.cvsignore));
+ }
+
// Create mda directory
CreateDirectory(basePath + "\\mda");
// Render /mda/maven.xml
@@ -193,6 +218,13 @@
// Render /mda/conf/andromda.xml
WriteFile(basePath + "\\mda\\conf\\andromda.xml", ParseVariables(Resource1.mda_conf_andromda_xml));
+ // Write mda/cvsignore
+ if (versionControl)
+ {
+ WriteFile(basePath + "\\mda\\" + ignoreFile, ParseVariables(Resource1.mda_cvsignore));
+ }
+
+ AddToStatus("Creating empty model file...");
// Create mda/src directory
System.IO.Directory.CreateDirectory(basePath + "\\mda\\src");
// Create mda/uml directory
@@ -214,7 +246,6 @@
WriteFile(basePath + "\\Lib\\NHibernate.dll", Resource1.lib_NHibernate_dll);
WriteFile(basePath + "\\Lib\\NHibernate.Nullables2.dll", Resource1.lib_NHibernate_Nullables2_dll);
-
// Add the references to all the DLLs we just put in /Lib
AddToStatus("Adding project references to common project...");
AddBinaryReferences(commonProject, basePath);
1.5 +2 -0 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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- MDASolutionWizard.cs 27 May 2006 22:31:46 -0000 1.4
+++ MDASolutionWizard.cs 28 May 2006 05:54:02 -0000 1.5
@@ -72,6 +72,7 @@
string solutionName = VSSolutionUtils.GetSolutionName(m_applicationObject.Solution);
txtApplicationName.Text = solutionName;
txtApplicationVersion.Text = "1.0";
+ ddlVersionControl.SelectedIndex = 0;
usrCommonProject.ProjectName = solutionName + ".Common";
usrCoreProject.ProjectName = solutionName + ".Core";
txtSchemaExportProject.Text = solutionName + ".SchemaExport";
@@ -325,6 +326,7 @@
config["application.name"] = txtApplicationName.Text;
config["application.name.nospaces"] = txtApplicationName.Text.Replace(" ", string.Empty);
config["application.version"] = txtApplicationVersion.Text;
+ config["application.versioncontrol"] = ddlVersionControl.SelectedItem.ToString();
config["application.model.filename"] = config["application.name.nospaces"] + ".Model.xml.zip";
config["application.model.filename.unzipped"] = config["application.name.nospaces"] + ".Model.xml";
1.3 +169 -141 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MDASolutionWizard.designer.cs 27 May 2006 22:31:46 -0000 1.2
+++ MDASolutionWizard.designer.cs 28 May 2006 05:54:02 -0000 1.3
@@ -31,12 +31,10 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MDASolutionWizard));
this.wizard1 = new Gui.Wizard.Wizard();
- 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.wizardPageSolutionInfo = new Gui.Wizard.WizardPage();
+ this.ddlVersionControl = new System.Windows.Forms.ComboBox();
this.ddlDatabaseType = new System.Windows.Forms.ComboBox();
+ this.label1 = new System.Windows.Forms.Label();
this.txtApplicationVersion = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
@@ -78,37 +76,43 @@
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.header4 = new Gui.Wizard.Header();
- 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.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.lblFinishPageTitle = new System.Windows.Forms.Label();
+ 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.wizard1.SuspendLayout();
- this.wizardPageWelcome.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
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();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
this.wizardPageProcessing.SuspendLayout();
this.header5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
- this.wizardPageComplete.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
this.SuspendLayout();
//
// wizard1
//
this.wizard1.ContainingForm = null;
+ 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);
@@ -116,8 +120,6 @@
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.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);
@@ -136,52 +138,11 @@
this.wizard1.TabIndex = 0;
this.wizard1.Load += new System.EventHandler(this.wizard1_Load);
//
- // wizardPageWelcome
- //
- 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;
- //
- // label9
- //
- 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");
- //
- // label8
- //
- 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";
- //
- // pictureBoxWelcome
- //
- 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;
- //
// wizardPageSolutionInfo
//
+ this.wizardPageSolutionInfo.Controls.Add(this.ddlVersionControl);
this.wizardPageSolutionInfo.Controls.Add(this.ddlDatabaseType);
+ this.wizardPageSolutionInfo.Controls.Add(this.label1);
this.wizardPageSolutionInfo.Controls.Add(this.txtApplicationVersion);
this.wizardPageSolutionInfo.Controls.Add(this.label17);
this.wizardPageSolutionInfo.Controls.Add(this.label14);
@@ -198,6 +159,19 @@
this.wizardPageSolutionInfo.ShowFromBack += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
this.wizardPageSolutionInfo.ShowFromNext += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
//
+ // ddlVersionControl
+ //
+ this.ddlVersionControl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.ddlVersionControl.FormattingEnabled = true;
+ this.ddlVersionControl.Items.AddRange(new object[] {
+ "None",
+ "CVS",
+ "Subversion"});
+ this.ddlVersionControl.Location = new System.Drawing.Point(15, 234);
+ this.ddlVersionControl.Name = "ddlVersionControl";
+ this.ddlVersionControl.Size = new System.Drawing.Size(335, 21);
+ this.ddlVersionControl.TabIndex = 7;
+ //
// ddlDatabaseType
//
this.ddlDatabaseType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -207,43 +181,52 @@
"MySQL",
"Oracle 9i",
"Hypersonic"});
- this.ddlDatabaseType.Location = new System.Drawing.Point(15, 187);
+ this.ddlDatabaseType.Location = new System.Drawing.Point(15, 189);
this.ddlDatabaseType.Name = "ddlDatabaseType";
- this.ddlDatabaseType.Size = new System.Drawing.Size(320, 21);
- this.ddlDatabaseType.TabIndex = 2;
+ this.ddlDatabaseType.Size = new System.Drawing.Size(335, 21);
+ this.ddlDatabaseType.TabIndex = 5;
+ //
+ // label1
+ //
+ this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label1.Location = new System.Drawing.Point(12, 214);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(507, 16);
+ this.label1.TabIndex = 6;
+ this.label1.Text = "Which version control system will you be using, if any?";
//
// txtApplicationVersion
//
- this.txtApplicationVersion.Location = new System.Drawing.Point(15, 141);
+ this.txtApplicationVersion.Location = new System.Drawing.Point(15, 144);
this.txtApplicationVersion.Name = "txtApplicationVersion";
- this.txtApplicationVersion.Size = new System.Drawing.Size(320, 21);
- this.txtApplicationVersion.TabIndex = 1;
+ this.txtApplicationVersion.Size = new System.Drawing.Size(335, 21);
+ this.txtApplicationVersion.TabIndex = 3;
//
// label17
//
this.label17.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label17.Location = new System.Drawing.Point(12, 168);
+ this.label17.Location = new System.Drawing.Point(12, 169);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(507, 16);
- this.label17.TabIndex = 29;
- this.label17.Text = "Which database will your application use?";
+ this.label17.TabIndex = 4;
+ this.label17.Text = "Which database server will your application use?";
//
// label14
//
this.label14.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label14.Location = new System.Drawing.Point(12, 123);
+ this.label14.Location = new System.Drawing.Point(12, 124);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(507, 16);
- this.label14.TabIndex = 29;
+ this.label14.TabIndex = 2;
this.label14.Text = "What is the version number of your application? (Example: 1.1-Release)";
//
// txtApplicationName
//
this.txtApplicationName.BackColor = System.Drawing.SystemColors.Window;
- this.txtApplicationName.Location = new System.Drawing.Point(15, 97);
+ this.txtApplicationName.Location = new System.Drawing.Point(15, 99);
this.txtApplicationName.Name = "txtApplicationName";
- this.txtApplicationName.Size = new System.Drawing.Size(320, 21);
- this.txtApplicationName.TabIndex = 0;
+ this.txtApplicationName.Size = new System.Drawing.Size(335, 21);
+ this.txtApplicationName.TabIndex = 1;
//
// label12
//
@@ -251,14 +234,14 @@
this.label12.Location = new System.Drawing.Point(12, 79);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(507, 16);
- this.label12.TabIndex = 29;
+ this.label12.TabIndex = 0;
this.label12.Text = "What is the name of your application? (Example: Time Tracker)";
//
// header6
//
this.header6.BackColor = System.Drawing.SystemColors.Control;
this.header6.CausesValidation = false;
- this.header6.Description = "Please enter the general information about your applicaiton.";
+ this.header6.Description = "Please enter the following general information about your applicaiton.";
this.header6.Dock = System.Windows.Forms.DockStyle.Top;
this.header6.Image = ((System.Drawing.Image)(resources.GetObject("header6.Image")));
this.header6.Location = new System.Drawing.Point(0, 0);
@@ -357,7 +340,7 @@
//
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(12, 79);
+ 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;
@@ -368,7 +351,7 @@
// txtSchemaExportProject
//
this.txtSchemaExportProject.Enabled = false;
- this.txtSchemaExportProject.Location = new System.Drawing.Point(30, 102);
+ 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;
@@ -413,7 +396,7 @@
//
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(12, 79);
+ 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;
@@ -424,7 +407,7 @@
// txtWebProject
//
this.txtWebProject.Enabled = false;
- this.txtWebProject.Location = new System.Drawing.Point(30, 102);
+ 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;
@@ -658,59 +641,48 @@
this.header4.TabIndex = 5;
this.header4.Title = "Confirm Choices";
//
- // wizardPageProcessing
- //
- 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);
- //
- // lstStatus
+ // wizardPageWelcome
//
- 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.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;
//
- // label7
+ // label9
//
- 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.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");
//
- // header5
+ // label8
//
- 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.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";
//
- // pictureBoxThrobber
+ // pictureBoxWelcome
//
- 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.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;
//
// wizardPageComplete
//
@@ -728,6 +700,19 @@
this.wizardPageComplete.TabIndex = 7;
this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
//
+ // lblFinishPageTitle
+ //
+ 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;
+ //
// pictureBoxComplete
//
this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
@@ -780,18 +765,59 @@
this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
this.txtErrorMessage.TabIndex = 14;
//
- // lblFinishPageTitle
+ // wizardPageProcessing
//
- 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.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);
+ //
+ // lstStatus
+ //
+ 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;
+ //
+ // label7
+ //
+ 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...";
+ //
+ // header5
+ //
+ 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;
//
// MDASolutionWizard
//
@@ -808,8 +834,6 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "AndroMDA Solution Wizard";
this.wizard1.ResumeLayout(false);
- this.wizardPageWelcome.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).EndInit();
this.wizardPageSolutionInfo.ResumeLayout(false);
this.wizardPageSolutionInfo.PerformLayout();
this.wizardPageCommonProject.ResumeLayout(false);
@@ -820,13 +844,15 @@
this.wizardPageWebProject.PerformLayout();
this.wizardPageConfirmChoices.ResumeLayout(false);
this.wizardPageConfirmChoices.PerformLayout();
+ this.wizardPageWelcome.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).EndInit();
+ this.wizardPageComplete.ResumeLayout(false);
+ this.wizardPageComplete.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).EndInit();
this.wizardPageProcessing.ResumeLayout(false);
this.wizardPageProcessing.PerformLayout();
this.header5.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).EndInit();
- this.wizardPageComplete.ResumeLayout(false);
- this.wizardPageComplete.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).EndInit();
this.ResumeLayout(false);
}
@@ -893,5 +919,7 @@
private System.Windows.Forms.Label label20;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.Label lblFinishPageTitle;
+ private System.Windows.Forms.ComboBox ddlVersionControl;
+ private System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
1.3 +678 -678 plugins/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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MDASolutionWizard.resx 27 May 2006 22:31:46 -0000 1.2
+++ MDASolutionWizard.resx 28 May 2006 05:54:02 -0000 1.3
@@ -118,266 +118,160 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="pictureBoxComplete.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="header6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- /9j/4AAQSkZJRgABAgEASABIAAD/4QpURXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+ /9j/4AAQSkZJRgABAgEASABIAAD/4QadRXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAcAAAAcgEyAAIAAAAUAAAAjodpAAQAAAAB
AAAApAAAANAACvyAAAAnEAAK/IAAACcQQWRvYmUgUGhvdG9zaG9wIENTMiBXaW5kb3dzADIwMDY6MDQ6
- MDIgMjM6MTU6NTYAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAApKADAAQAAAABAAABgwAAAAAAAAAG
+ MDIgMjM6MTk6NDQAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAM6ADAAQAAAABAAAAMwAAAAAAAAAG
AQMAAwAAAAEABgAAARoABQAAAAEAAAEeARsABQAAAAEAAAEmASgAAwAAAAEAAgAAAgEABAAAAAEAAAEu
- AgIABAAAAAEAAAkeAAAAAAAAAEgAAAABAAAASAAAAAH/2P/gABBKRklGAAECAABIAEgAAP/tAAxBZG9i
+ AgIABAAAAAEAAAVnAAAAAAAAAEgAAAABAAAASAAAAAH/2P/gABBKRklGAAECAABIAEgAAP/tAAxBZG9i
ZV9DTQAB/+4ADkFkb2JlAGSAAAAAAf/bAIQADAgICAkIDAkJDBELCgsRFQ8MDA8VGBMTFRMTGBEMDAwM
DAwRDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAENCwsNDg0QDg4QFA4ODhQUDg4ODhQRDAwMDAwR
- EQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgAoABEAwEiAAIRAQMRAf/dAAQA
- Bf/EAT8AAAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcI
+ EQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgAMwAzAwEiAAIRAQMRAf/dAAQA
+ BP/EAT8AAAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcI
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
- 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
- bST5LSx+j0VakK2bmjhCfkeahlmzT60PBuQw4sY0ASbaax7QEC28INuR5qnbkeaMMRJsqnkA2bHr+9JZ
- v2j3pKx7P5MHu/m//9XJZkogyvNYrcnzRBleazzy/g6gzOx9p80xyvNZX2rzTHK80Pu6733TdleaC/J8
- 1nuyfNBdkp8eX8FkszdsyVVtyFWdcT3QnPJU8MIDBPN4pvWO6UlXk8pKXgDB7xf/1uEDynFigkhQXCcu
- 6T1T4peohpJUE+5JkXpi4pkkaQZk9VSkkkktUkkkkp//1+CSSSSUpJJJJSkkkklKSSSSUpJJJJT/AP/Q
- 4JJJJJSkkkklKSSSSUpJJJJSkkkklP8A/9n/7RB0UGhvdG9zaG9wIDMuMAA4QklNBCUAAAAAABAAAAAA
- AAAAAAAAAAAAAAAAOEJJTQPtAAAAAAAQAEgAAAABAAEASAAAAAEAAThCSU0EJgAAAAAADgAAAAAAAAAA
- AAA/gAAAOEJJTQQNAAAAAAAEAAAAHjhCSU0EGQAAAAAABAAAAB44QklNA/MAAAAAAAkAAAAAAAAAAAEA
- OEJJTQQKAAAAAAABAAA4QklNJxAAAAAAAAoAAQAAAAAAAAACOEJJTQP1AAAAAABIAC9mZgABAGxmZgAG
- AAAAAAABAC9mZgABAKGZmgAGAAAAAAABADIAAAABAFoAAAAGAAAAAAABADUAAAABAC0AAAAGAAAAAAAB
- OEJJTQP4AAAAAABwAAD/////////////////////////////A+gAAAAA////////////////////////
- /////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////
- A+gAADhCSU0EAAAAAAAAAgADOEJJTQQCAAAAAAAIAAAAAAAAAAA4QklNBDAAAAAAAAQBAQEBOEJJTQQt
- AAAAAAAGAAEAAAAEOEJJTQQIAAAAAAAQAAAAAQAAAkAAAAJAAAAAADhCSU0EH...
[truncated message content] |
