From: Chris M. <cm...@us...> - 2006-12-13 16:03:59
|
User: cmicali Date: 06/12/13 08:03:58 Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn AndroMDA.VS80AddIn.csproj ConversionCodeGenerator.cs MDASolutionManager.cs VS80AddIn.cs WizardSolutionProcessor.cs etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf andromda-m2.xml etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda pom.xml etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml empty.model.membership.xml etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources pom.xml etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards MDASolutionWizard.cs MDASolutionWizard.designer.cs etc/andromda-dotnet/AndroMDA.VS80AddIn Android VS Readme.rtf etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS Setup.nsi Log: - Updated code generator to work with the new 1.1 .NET cartridges - Fixed some of the template output - Fixed empty folder resync issue Revision Changes Path 1.19 +6 -1 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.18 retrieving revision 1.19 diff -u -w -r1.18 -r1.19 --- AndroMDA.VS80AddIn.csproj 25 Jul 2006 13:09:28 -0000 1.18 +++ AndroMDA.VS80AddIn.csproj 13 Dec 2006 16:03:57 -0000 1.19 @@ -38,6 +38,10 @@ <Reference Include="Microsoft.VisualStudio.VCCodeModel, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <Reference Include="Microsoft.VisualStudio.VCProject, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <Reference Include="NVelocity, Version=0.5.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>lib\NVelocity.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.configuration" /> <Reference Include="System.Data" /> @@ -126,6 +130,7 @@ </Compile> <EmbeddedResource Include="Resources\SchemaExport\TestDataManager.cs" /> <Compile Include="Utils\CodeModelUtils.cs" /> + <Compile Include="Utils\TemplateMaschine.cs" /> <Compile Include="WizardSolutionProcessor.cs" /> <Compile Include="AddInSettings.cs" /> <Compile Include="Resource1.Designer.cs"> @@ -321,7 +326,7 @@ <None Include="Resources\about_logo.jpg" /> <Content Include="Resources\mda\conf\andromda-m2.xml" /> <Content Include="Resources\mda\conf\mappings\MergeMappings.xml" /> - <Content Include="Resources\mda\pom.xml" /> + <None Include="Resources\mda\pom.xml" /> <Content Include="Resources\mda\src\uml\empty.model.membership.xml" /> <None Include="Resources\pom.xml" /> <None Include="Resources\settings.xml" /> 1.3 +2 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/ConversionCodeGenerator.cs Index: ConversionCodeGenerator.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/ConversionCodeGenerator.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- ConversionCodeGenerator.cs 25 Jul 2006 13:09:28 -0000 1.2 +++ ConversionCodeGenerator.cs 13 Dec 2006 16:03:57 -0000 1.3 @@ -102,8 +102,8 @@ { returnVariableName = "entity"; codeToInsert += "// VO to entity conversion\n"; - // Add code to create a new entity with the Factory.newInstance() method - codeToInsert += returnType + " " + returnVariableName + " = " + returnType + ".Factory.newInstance();\n\n"; + // Add code to create a new entity with the Factory.NewInstance() method + codeToInsert += returnType + " " + returnVariableName + " = " + returnType + ".Factory.NewInstance();\n\n"; } else { 1.19 +64 -54 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDASolutionManager.cs Index: MDASolutionManager.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDASolutionManager.cs,v retrieving revision 1.18 retrieving revision 1.19 diff -u -w -r1.18 -r1.19 --- MDASolutionManager.cs 2 Oct 2006 01:57:05 -0000 1.18 +++ MDASolutionManager.cs 13 Dec 2006 16:03:57 -0000 1.19 @@ -47,8 +47,6 @@ //private MavenProxy m_mavenProxy = null; private MavenProxy m_mavenProxy = null; - private int m_progress; - #endregion #region Properties @@ -453,7 +451,7 @@ (m_addInSettings.MavenUseOfflineMode || (m_addInSettings.MavenUseCustomCommandLine && m_addInSettings.MavenCustomCommandLine.ToLower().Contains("-o"))) ) { - if ( System.Windows.Forms.MessageBox.Show("It appears that AndroMDA is missing one or more packages it needs to run. AndroMDA can automatically connect to the internet and download any missing dependencies, but it is currently running in offline mode. Would you like to re-run AndroMDA with offline mode temporarily disabled?" + Environment.NewLine + Environment.NewLine + "Please note that downloading all the required packages may take up to 10 minutes or more depending on your connection speed. You will only need to download these packages this one time as long as you leave offline mode enabled.", "AndroMDA Generate Failed", System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Question, System.Windows.Forms.MessageBoxDefaultButton.Button1) == System.Windows.Forms.DialogResult.Yes) + if ( System.Windows.Forms.MessageBox.Show("It appears that AndroMDA is missing one or more packages it needs to run. Would you like to download the missing files?", "AndroMDA Generate Failed", System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Question, System.Windows.Forms.MessageBoxDefaultButton.Button1) == System.Windows.Forms.DialogResult.Yes) { // Rerun maven without the -o option RunMaven(true); @@ -474,6 +472,7 @@ try { DoRefreshGeneratedFiles(); + m_applicationObject.StatusBar.Progress(false, string.Empty, 0, 0); m_applicationObject.StatusBar.Text = "Android/VS: Solution resync complete"; } catch (Exception e) @@ -489,7 +488,6 @@ private void DoRefreshGeneratedFiles() { - m_progress = 0; UpdateResyncProgressBar(); string[] syncFolders = m_addInSettings.SyncFolderList.Split(new char[] { ';' }); @@ -508,49 +506,35 @@ else { UpdateResyncProgressBar(proj.Name); - // Search for the existing foreach (string folder in syncFolders) { string folderCleaned = folder.Replace('/', '\\').Trim('\\'); if (folderCleaned.Length > 0) { - string folderPath = proj.Properties.Item("FullPath").Value.ToString().Trim('\\'); - folderPath = folderPath + "\\" + folderCleaned; - if (System.IO.Directory.Exists(folderPath)) - { - proj.ProjectItems.AddFromDirectory(folderPath); - } - } - } + string folderPath = proj.Properties.Item("FullPath").Value.ToString().Trim('\\') + "\\" + folderCleaned; + ProjectItem folderItem = null; foreach (ProjectItem item in proj.ProjectItems) { - if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFolder) + if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFolder && + folderPath == item.Properties.Item("FullPath").Value.ToString().Trim('\\')) { - string folderPath = item.Properties.Item("FullPath").Value.ToString(); - if (m_addInSettings.IsInSyncFoldersList(folderPath)) - { - ResyncFolder(item, proj.Name); - } - } - } - } + folderItem = item; } } - private void ResyncFolder(ProjectItem folderProjectItem, string projectName) + if (System.IO.Directory.Exists(folderPath)) { - if (folderProjectItem == null) return; - - string folderPath = folderProjectItem.Properties.Item("FullPath").Value.ToString(); - - UpdateResyncProgressBar("Getting file list for " + projectName + "/" + folderProjectItem.Name); + bool skip = false; // Get the list of files in the filesystem ArrayList filesystemFileList = GetFileListFromFilesystem(folderPath); + + if (folderItem != null) + { // Get the list of files in the solution tree - ArrayList solutionTreeFileList = GetFileListFromProjectTree(folderProjectItem); + ArrayList solutionTreeFileList = GetFileListFromProjectTree(folderItem); // Generate a hash for the filesystem list int filesHash = GetArrayListHashCode(filesystemFileList); // Generate a hash for the solution tree list @@ -559,13 +543,36 @@ // If the hash codes are the same, we don't need to do a resync if (filesHash == solutionHash) { - UpdateResyncProgressBar("Files have not changed since last resync: " + projectName + "/" + folderProjectItem.Name, 1, 1); - return; + UpdateResyncProgressBar("Files have not changed since last resync: " + proj.Name + "/" + folderItem.Name, 1, 1); + skip = true; } + } + if (!skip) + { + if (folderItem != null) + { + folderItem.Remove(); + } + UpdateResyncProgressBar(folderCleaned, 0, filesystemFileList.Count); + //folderItem = proj.ProjectItems. + ((VSLangProj.VSProject)proj.Object).Refresh(); - CollapseProject(projectName); - RemoveIgnoredItems(folderProjectItem.ProjectItems, filesystemFileList.Count); - UpdateResyncProgressBar(projectName + "/" + folderProjectItem.Name); + folderItem = proj.ProjectItems.AddFromDirectory(folderPath); + CollapseProject(proj.Name); + RemoveIgnoredItems(folderItem.ProjectItems, filesystemFileList.Count); + } + } + else + { + if (folderItem != null) + { + folderItem.Remove(); + } + } + } + } + } + } } private void RemoveIgnoredItems(ProjectItems items, int totalItems) @@ -577,18 +584,20 @@ { foreach (ProjectItem item in items) { - if (m_addInSettings.IsInIgnoreList(item.Name)) + if (m_addInSettings.IsInIgnoreList(item.Name) || + (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFile && !System.IO.File.Exists(item.Properties.Item("FullPath").Value.ToString())) + ) { item.Remove(); } else { - if (item.ProjectItems != null && item.ProjectItems.Count > 0) + if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFolder) { currentItem++; currentItem = RemoveIgnoredItems(item.ProjectItems, currentItem, totalItems); } - else + else if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFile) { UpdateResyncProgressBar(item.Name, currentItem++, totalItems); string file = item.Name; @@ -798,7 +807,8 @@ { detail = "(" + detail + ")"; } - if (currentProgress > totalProgress) currentProgress = totalProgress; + if (currentProgress > totalProgress) { currentProgress = totalProgress; } + if (totalProgress == 0) { totalProgress++; } m_applicationObject.StatusBar.Progress(true, "Android/VS: Refreshing generated files... " + detail, currentProgress, totalProgress); } 1.17 +5 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/VS80AddIn.cs Index: VS80AddIn.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/VS80AddIn.cs,v retrieving revision 1.16 retrieving revision 1.17 diff -u -w -r1.16 -r1.17 --- VS80AddIn.cs 28 Sep 2006 20:28:39 -0000 1.16 +++ VS80AddIn.cs 13 Dec 2006 16:03:57 -0000 1.17 @@ -13,6 +13,9 @@ using System.IO; using Microsoft.VisualStudio.CommandBars; +using Velocity = NVelocity.App.Velocity; +using VelocityContext = NVelocity.VelocityContext; + #endregion namespace AndroMDA.VS80AddIn @@ -20,7 +23,7 @@ public class VS80AddIn { - public const string ADD_IN_VERSION = "1.5"; + public const string ADD_IN_VERSION = "1.6.1"; #region Constants @@ -141,6 +144,7 @@ CreateCommands(); RegisterCommands(); RegisterToolbar(); + Velocity.Init(); m_connected = true; } catch (Exception e) 1.15 +149 -110 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.14 retrieving revision 1.15 diff -u -w -r1.14 -r1.15 --- WizardSolutionProcessor.cs 28 Sep 2006 20:28:39 -0000 1.14 +++ WizardSolutionProcessor.cs 13 Dec 2006 16:03:57 -0000 1.15 @@ -19,6 +19,10 @@ using ICSharpCode.SharpZipLib.Checksums; using ICSharpCode.SharpZipLib.Zip; +using Velocity = NVelocity.App.Velocity; +using VelocityContext = NVelocity.VelocityContext; +using Template = NVelocity.Template; + #endregion namespace AndroMDA.VS80AddIn @@ -42,6 +46,9 @@ private ConfigFile m_configuration = null; + // lets make a Context and put data into it + VelocityContext nvelocityContext; + #endregion #region Constructors @@ -110,8 +117,133 @@ string emptyModelFileData = Resource1.mda_src_uml_empty_model_xml; - m_configuration["cartridges.aspnet.rootpom.dependencies"] = " <dependency>\n <groupId>org.andromda.cartridges</groupId>\n <artifactId>andromda-aspdotnet-cartridge</artifactId>\n <version>1.0-SNAPSHOT</version>\n </dependency>\n"; - m_configuration["cartridges.aspnet.mdapom.dependencies"] = " <dependency>\n <groupId>org.andromda.cartridges</groupId>\n <artifactId>andromda-aspdotnet-cartridge</artifactId>\n </dependency>\n"; + //m_configuration["cartridges.aspnet.rootpom.dependencies"] = " <dependency>\n <groupId>org.andromda.cartridges</groupId>\n <artifactId>andromda-aspdotnet-cartridge</artifactId>\n <version>1.0-SNAPSHOT</version>\n </dependency>\n"; + //m_configuration["cartridges.aspnet.mdapom.dependencies"] = " <dependency>\n <groupId>org.andromda.cartridges</groupId>\n <artifactId>andromda-aspdotnet-cartridge</artifactId>\n </dependency>\n"; + + nvelocityContext = new VelocityContext(); + foreach (string key in m_configuration.Keys) + { + object value = m_configuration[key]; + if (m_configuration[key] == "true" || m_configuration[key] == "false") + { + value = GetConfigSettingBool(key); + } + + nvelocityContext.Put("wizard." + key, value); + nvelocityContext.Put("wizard_" + key.Replace('.', '_'), value); + } + + AddToStatus("Creating AndroMDA configuration files..."); + + // Create mda directory + CreateDirectory(basePath + "\\mda"); + // Create mda/conf directory + CreateDirectory(basePath + "\\mda\\conf"); + + // Render /cvsignore + if (versionControl) + { + WriteFile(basePath + "\\" + ignoreFile, ParseVariables(Resource1.cvsignore)); + } + + if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 1.x") + { + // Render /maven.xml + WriteFile(basePath + "\\maven.xml", ParseVariables(Resource1.maven_xml)); + // Render /project.properties + WriteFile(basePath + "\\project.properties", ParseVariables(Resource1.project_properties)); + // Render /project.xml + WriteFile(basePath + "\\project.xml", ParseVariables(Resource1.project_xml)); + + // Render /mda/maven.xml + WriteFile(basePath + "\\mda\\maven.xml", ParseVariables(Resource1.mda_maven_xml)); + // Render /mda/project.properties + WriteFile(basePath + "\\mda\\project.properties", ParseVariables(Resource1.mda_project_properties)); + // Render /mda/project.xml + WriteFile(basePath + "\\mda\\project.xml", ParseVariables(Resource1.mda_project_xml)); + + // Render /mda/conf/andromda.xml + WriteFile(basePath + "\\mda\\conf\\andromda.xml", ParseVariables(Resource1.mda_conf_andromda_xml)); + } + + if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 2.x") + { + + // Render /pom.xml + WriteFile(basePath + "\\pom.xml", RenderTemplate(Resource1.pom_xml, "pom.xml")); + // Render /mda/pom.xml + WriteFile(basePath + "\\mda\\pom.xml", RenderTemplate(Resource1.mda_pom_xml, "mda/pom.xml")); + + // Render /mda/conf/andromda.xml + WriteFile(basePath + "\\mda\\conf\\andromda.xml", RenderTemplate(Resource1.mda_conf_andromda_m2_xml, "mda/conf/andromda.xml")); + + // Create mda/conf/mappings directory + CreateDirectory(basePath + "\\mda\\conf\\mappings"); + + // Render /mda/conf/mappings/MergeMappings.xml + WriteFile(basePath + "\\mda\\conf\\mappings\\MergeMappings.xml", ParseVariables(Resource1.mda_conf_mappings_MergeMappings_xml)); + + } + + // Write mda/cvsignore + if (versionControl) + { + WriteFile(basePath + "\\mda\\" + ignoreFile, ParseVariables(Resource1.mda_cvsignore)); + } + + + // Create the AndroMDA solution folder + AddToStatus("Adding solution folder..."); + Solution2 sol = m_applicationObject.Solution as Solution2; + Project solutionFolder = null; + try + { + solutionFolder = sol.AddSolutionFolder("AndroMDA"); + if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 1.x") + { + + solutionFolder.ProjectItems.AddFromFile(basePath + "\\mda\\project.properties"); + } + if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 2.x") + { + + solutionFolder.ProjectItems.AddFromFile(basePath + "\\mda\\pom.xml"); + } + solutionFolder.ProjectItems.AddFromFile(basePath + "\\mda\\conf\\andromda.xml"); + } + catch { } + + + AddToStatus("Creating empty model file..."); + // Create mda/src directory + System.IO.Directory.CreateDirectory(basePath + "\\mda\\src"); + // Create mda/uml directory + System.IO.Directory.CreateDirectory(basePath + "\\mda\\src\\uml"); + + string modelPackageXML = "<UML:Model xmi.id='_9_5_1_874026a_1149883877463_480535_0' name='" + m_configuration["solution.name"] + "'><UML:Namespace.ownedElement>"; + string xmiIdBase = "_9_5_1_874026a_" + DateTime.Now.Ticks.ToString(); + modelPackageXML += GetXMI(m_configuration["solution.name"].Split('.'), xmiIdBase); + modelPackageXML += "</UML:Namespace.ownedElement></UML:Model>"; + + emptyModelFileData = emptyModelFileData.Replace("${wizard.model.packagestructure.xml}", modelPackageXML); + + //emptyModelFileData = RenderTemplate(emptyModelFileData, "empty.model.xmi"); + + if (GetConfigSettingBool("application.model.zipped")) + { + // Create the empty model file + WriteCompressedFile(m_configuration["application.model.filename.unzipped"], basePath + "\\mda\\src\\uml\\" + m_configuration["application.model.filename"], emptyModelFileData); + } + else + { + // Create the empty model file + WriteFile(basePath + "\\mda\\src\\uml\\" + m_configuration["application.model.filename"], emptyModelFileData); + } + + + + + ////////////////////////////////// // Create/find the common project @@ -388,112 +520,6 @@ nhibernateConfig.Properties.Item("BuildAction").Value = VSLangProj.prjBuildAction.prjBuildActionContent; } - AddToStatus("Creating AndroMDA configuration files..."); - - // Create mda directory - CreateDirectory(basePath + "\\mda"); - // Create mda/conf directory - CreateDirectory(basePath + "\\mda\\conf"); - - // Render /cvsignore - if (versionControl) - { - WriteFile(basePath + "\\" + ignoreFile, ParseVariables(Resource1.cvsignore)); - } - - if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 1.x") - { - // Render /maven.xml - WriteFile(basePath + "\\maven.xml", ParseVariables(Resource1.maven_xml)); - // Render /project.properties - WriteFile(basePath + "\\project.properties", ParseVariables(Resource1.project_properties)); - // Render /project.xml - WriteFile(basePath + "\\project.xml", ParseVariables(Resource1.project_xml)); - - // Render /mda/maven.xml - WriteFile(basePath + "\\mda\\maven.xml", ParseVariables(Resource1.mda_maven_xml)); - // Render /mda/project.properties - WriteFile(basePath + "\\mda\\project.properties", ParseVariables(Resource1.mda_project_properties)); - // Render /mda/project.xml - WriteFile(basePath + "\\mda\\project.xml", ParseVariables(Resource1.mda_project_xml)); - - // Render /mda/conf/andromda.xml - WriteFile(basePath + "\\mda\\conf\\andromda.xml", ParseVariables(Resource1.mda_conf_andromda_xml)); - } - - if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 2.x") - { - - - - // Render /pom.xml - WriteFile(basePath + "\\pom.xml", ParseVariables(Resource1.pom_xml)); - // Render /mda/pom.xml - WriteFile(basePath + "\\mda\\pom.xml", ParseVariables(Resource1.mda_pom_xml)); - - // Render /mda/conf/andromda.xml - WriteFile(basePath + "\\mda\\conf\\andromda.xml", ParseVariables(Resource1.mda_conf_andromda_m2_xml)); - - // Create mda/conf/mappings directory - CreateDirectory(basePath + "\\mda\\conf\\mappings"); - - // Render /mda/conf/mappings/MergeMappings.xml - WriteFile(basePath + "\\mda\\conf\\mappings\\MergeMappings.xml", ParseVariables(Resource1.mda_conf_mappings_MergeMappings_xml)); - - } - - // Write mda/cvsignore - if (versionControl) - { - WriteFile(basePath + "\\mda\\" + ignoreFile, ParseVariables(Resource1.mda_cvsignore)); - } - - - // Create the AndroMDA solution folder - AddToStatus("Adding solution folder..."); - Solution2 sol = m_applicationObject.Solution as Solution2; - Project solutionFolder = null; - try - { - solutionFolder = sol.AddSolutionFolder("AndroMDA"); - if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 1.x") - { - - solutionFolder.ProjectItems.AddFromFile(basePath + "\\mda\\project.properties"); - } - if (m_configuration["application.andromda.bootstrap"] == "Apache Maven 2.x") - { - - solutionFolder.ProjectItems.AddFromFile(basePath + "\\mda\\pom.xml"); - } - solutionFolder.ProjectItems.AddFromFile(basePath + "\\mda\\conf\\andromda.xml"); - } - catch { } - - - AddToStatus("Creating empty model file..."); - // Create mda/src directory - System.IO.Directory.CreateDirectory(basePath + "\\mda\\src"); - // Create mda/uml directory - System.IO.Directory.CreateDirectory(basePath + "\\mda\\src\\uml"); - - string modelPackageXML = "<UML:Model xmi.id='_9_5_1_874026a_1149883877463_480535_0' name='" + m_configuration["solution.name"] + "'><UML:Namespace.ownedElement>"; - string xmiIdBase = "_9_5_1_874026a_" + DateTime.Now.Ticks.ToString(); - modelPackageXML += GetXMI(m_configuration["solution.name"].Split('.'), xmiIdBase); - modelPackageXML += "</UML:Namespace.ownedElement></UML:Model>"; - - emptyModelFileData = emptyModelFileData.Replace("${wizard.model.packagestructure.xml}", modelPackageXML); - - if (GetConfigSettingBool("application.model.zipped")) - { - // Create the empty model file - WriteCompressedFile(m_configuration["application.model.filename.unzipped"], basePath + "\\mda\\src\\uml\\" + m_configuration["application.model.filename"], emptyModelFileData); - } - else - { - // Create the empty model file - WriteFile(basePath + "\\mda\\src\\uml\\" + m_configuration["application.model.filename"], emptyModelFileData); - } // Create the lib directory CreateDirectory(basePath + "\\Lib"); @@ -561,6 +587,7 @@ { try { proj.References.AddFromProject(webCommonProject); } catch { } } + //m_applicationObject.Solution.Properties.Item("StartupProject").Value = webProject.Name; } if (webCommonProject != null) @@ -699,6 +726,18 @@ } /// <summary> + /// Parses and resolves all variables in a string + /// </summary> + /// <param name="content">The string to parse.</param> + /// <returns></returns> + private string RenderTemplate(string content, string filename) + { + StringWriter writer = new StringWriter(); + Velocity.Evaluate(nvelocityContext, writer, filename, content); + return writer.GetStringBuilder().ToString(); + } + + /// <summary> /// Writes a file to disk. This will call ParseVariables() on the content. /// </summary> /// <param name="filePath">The file to which to write.</param> @@ -739,7 +778,7 @@ zip.SetLevel(6); System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding(); - byte[] fileData = encoding.GetBytes(fileContent); + byte[] fileData = encoding.GetBytes(ParseVariables(fileContent)); ZipEntry entry = new ZipEntry(fileNameInZip); entry.DateTime = DateTime.Now; 1.4 +3 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf/andromda-m2.xml Index: andromda-m2.xml =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf/andromda-m2.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- andromda-m2.xml 2 Oct 2006 01:57:07 -0000 1.3 +++ andromda-m2.xml 13 Dec 2006 16:03:57 -0000 1.4 @@ -156,6 +156,7 @@ </properties> </namespace> +#if ($wizard_cartridges_aspnet_configure) <namespace name="aspdotnet"> <properties> <property name="web">${web.dir}</property> @@ -176,6 +177,7 @@ <property name="AssemblyKeyName"></property> </properties> </namespace> +#end </namespaces> </andromda> \ No newline at end of file 1.4 +7 -4 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/pom.xml Index: pom.xml =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/pom.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- pom.xml 28 Sep 2006 20:28:40 -0000 1.3 +++ pom.xml 13 Dec 2006 16:03:57 -0000 1.4 @@ -66,9 +66,12 @@ <groupId>org.andromda.cartridges</groupId> <artifactId>andromda-cs-cartridge</artifactId> </dependency> - -${wizard.cartridges.aspnet.mdapom.dependencies} - +#if ($wizard_cartridges_aspnet_configure) + <dependency> + <groupId>org.andromda.cartridges</groupId> + <artifactId>andromda-aspdotnet-cartridge</artifactId> + </dependency> +#end <dependency> <groupId>org.andromda.translationlibraries</groupId> <artifactId>andromda-ocl-validation-library</artifactId> 1.3 +669 -805 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml/empty.model.membership.xml Index: empty.model.membership.xml =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml/empty.model.membership.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- empty.model.membership.xml 22 Aug 2006 02:14:00 -0000 1.2 +++ empty.model.membership.xml 13 Dec 2006 16:03:57 -0000 1.3 @@ -11,7 +11,7 @@ </UML:ModelElement.stereotype> <UML:ModelElement.taggedValue> <UML:TaggedValue xmi.id='_9_5_1_874026a_1147802781652_96551_1178' name='@andromda.persistence.table'> - <UML:TaggedValue.dataValue>AppUser</UML:TaggedValue.dataValue> + <UML:TaggedValue.dataValue>USERS</UML:TaggedValue.dataValue> <UML:TaggedValue.type> <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_846703_8'> <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> @@ -30,28 +30,6 @@ </XMI.extension> </UML:Classifier> </UML:StructuralFeature.type> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531157259_859391_612' name='@andromda.persistence.column'> - <UML:TaggedValue.dataValue>UserName</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'> - <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> - <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/> - </XMI.extension> - </UML:TagDefinition> - </UML:TaggedValue.type> - </UML:TaggedValue> - <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531157299_27598_613' name='@andromda.persistence.column.length'> - <UML:TaggedValue.dataValue>256</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_54372_83'> - <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> - <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column.length'/> - </XMI.extension> - </UML:TagDefinition> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Attribute> <UML:Attribute xmi.id='_9_5_1_874026a_1147802183922_246121_617' name='password' visibility='public'> <UML:StructuralFeature.type> @@ -61,28 +39,6 @@ </XMI.extension> </UML:Classifier> </UML:StructuralFeature.type> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531272795_378175_653' name='@andromda.persistence.column'> - <UML:TaggedValue.dataValue>Password</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'> - <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> - <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/> - </XMI.extension> - </UML:TagDefinition> - </UML:TaggedValue.type> - </UML:TaggedValue> - <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531272795_521455_654' name='@andromda.persistence.column.length'> - <UML:TaggedValue.dataValue>256</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_54372_83'> - <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> - <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column.length'/> - </XMI.extension> - </UML:TagDefinition> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Attribute> <UML:Attribute xmi.id='_9_5_1_874026a_1147802201317_473762_665' name='email' visibility='public'> <UML:StructuralFeature.type> @@ -92,28 +48,6 @@ </XMI.extension> </UML:Classifier> </UML:StructuralFeature.type> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531260558_788669_651' name='@andromda.persistence.column'> - <UML:TaggedValue.dataValue>Email</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'> - <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> - <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/> - </XMI.extension> - </UML:TagDefinition> - </UML:TaggedValue.type> - </UML:TaggedValue> - <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531260578_666515_652' name='@andromda.persistence.column.length'> - <UML:TaggedValue.dataValue>256</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_54372_83'> - <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> - <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column.length'/> - </XMI.extension> - </UML:TagDefinition> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Attribute> <UML:Attribute xmi.id='_9_5_1_874026a_1147802206795_951750_668' name='isActive' visibility='public'> <UML:StructuralFeature.type> @@ -123,18 +57,6 @@ </XMI.extension> </UML:Classifier> </UML:StructuralFeature.type> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531282910_856125_655' name='@andromda.persistence.column'> - <UML:TaggedValue.dataValue>IsActive</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'> - <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> - <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/> - </XMI.extension> - </UML:TagDefinition> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Attribute> <UML:Attribute xmi.id='_9_5_1_874026a_1147974181922_327912_0' name='comment' visibility='public'> <UML:StructuralFeature.multiplicity> @@ -151,28 +73,6 @@ </XMI.extension> </UML:Classifier> </UML:StructuralFeature.type> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531296159_941861_656' name='@andromda.persistence.column'> - <UML:TaggedValue.dataValue>Comment</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'> - <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> - <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/> - </XMI.extension> - </UML:TagDefinition> - </UML:TaggedValue.type> - </UML:TaggedValue> - <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531296159_175283_657' name='@andromda.persistence.column.length'> - <UML:TaggedValue.dataValue>256</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_54372_83'> - <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> - <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column.length'/> - </XMI.extension> - </UML:TagDefinition> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Attribute> <UML:Attribute xmi.id='_9_5_1_874026a_1147974187300_531457_3' name='creationDate' visibility='public'> <UML:StructuralFeature.type> @@ -182,18 +82,6 @@ </XMI.extension> </UML:Classifier> </UML:StructuralFeature.type> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531304461_703846_658' name='@andromda.persistence.column'> - <UML:TaggedValue.dataValue>CreationDate</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'> - <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> - <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/> - </XMI.extension> - </UML:TagDefinition> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Attribute> </UML:Classifier.feature> </UML:Class> @@ -205,32 +93,8 @@ </XMI.extension> </UML:Stereotype> </UML:ModelElement.stereotype> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531334043_858539_664' name='@andromda.persistence.table'> - <UML:TaggedValue.dataValue>UserRole</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_846703_8'> - <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> - <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.table'/> - </XMI.extension> - </UML:TagDefinition> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> <UML:Classifier.feature> <UML:Attribute xmi.id='_9_5_1_874026a_1147802436365_530056_674' name='role' visibility='public' type='_9_5_1_874026a_1147801720876_670493_267'> - <UML:ModelElement.taggedValue> - <UML:TaggedValue xmi.id='_9_5_1_874026a_1148531353151_918674_665' name='@andromda.persistence.column'> - <UML:TaggedValue.dataValue>Role</UML:TaggedValue.dataValue> - <UML:TaggedValue.type> - <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'> - <XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'> - <referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.column'/> - </XMI.extension> - </UML:TagDefinition> - </UML:TaggedValue.type> - </UML:TaggedValue> - </UML:ModelElement.taggedValue> </UML:Attribute> </UML:Classifier.feature> </UML:Class> 1.8 +7 -3 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/pom.xml Index: pom.xml =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/pom.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -r1.7 -r1.8 --- pom.xml 2 Oct 2006 01:57:08 -0000 1.7 +++ pom.xml 13 Dec 2006 16:03:58 -0000 1.8 @@ -53,9 +53,13 @@ <artifactId>andromda-cs-cartridge</artifactId> <version>1.1-SNAPSHOT</version> </dependency> - -${wizard.cartridges.aspnet.rootpom.dependencies} - +#if ($wizard_cartridges_aspnet_configure) + <dependency> + <groupId>org.andromda.cartridges</groupId> + <artifactId>andromda-aspdotnet-cartridge</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> +#end </dependencies> </dependencyManagement> <build> 1.5 +2 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.cs Index: MDASolutionWizard.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- MDASolutionWizard.cs 28 Sep 2006 20:28:41 -0000 1.4 +++ MDASolutionWizard.cs 13 Dec 2006 16:03:58 -0000 1.5 @@ -90,6 +90,8 @@ cbConfigureUnitTestingProject.Checked = true; cbConfigureUnitTestingProject.Checked = false; + txtAndroMDAVersion.Text = "3.2"; + // Give the wizard a reference to this form so it can // set this.AcceptButton to the Next button wizard1.ContainingForm = this; 1.5 +91 -92 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.designer.cs Index: MDASolutionWizard.designer.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.designer.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- MDASolutionWizard.designer.cs 28 Sep 2006 20:28:41 -0000 1.4 +++ MDASolutionWizard.designer.cs 13 Dec 2006 16:03:58 -0000 1.5 @@ -76,12 +76,6 @@ this.txtApplicationName = new System.Windows.Forms.TextBox(); this.label12 = new System.Windows.Forms.Label(); this.header6 = new Gui.Wizard.Header(); - this.wizardPageWebCommonProject = new Gui.Wizard.WizardPage(); - this.lblMembershipSelectedImage = new System.Windows.Forms.Label(); - this.lblMembershipSelected = new System.Windows.Forms.Label(); - this.cbConfigureWebCommonProject = new System.Windows.Forms.CheckBox(); - this.usrWebCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl(); - this.header8 = new Gui.Wizard.Header(); this.wizardPageWelcome = new Gui.Wizard.WizardPage(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.label9 = new System.Windows.Forms.Label(); @@ -106,6 +100,12 @@ this.columnHeader1 = new System.Windows.Forms.ColumnHeader(); this.columnHeader2 = new System.Windows.Forms.ColumnHeader(); this.header4 = new Gui.Wizard.Header(); + this.wizardPageWebCommonProject = new Gui.Wizard.WizardPage(); + this.lblMembershipSelectedImage = new System.Windows.Forms.Label(); + this.lblMembershipSelected = new System.Windows.Forms.Label(); + this.cbConfigureWebCommonProject = new System.Windows.Forms.CheckBox(); + this.usrWebCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl(); + this.header8 = new Gui.Wizard.Header(); this.wizard1.SuspendLayout(); this.wizardPageWebProject.SuspendLayout(); this.wizardPageUnitTestingProject.SuspendLayout(); @@ -114,7 +114,6 @@ this.wizardPageCommonProject.SuspendLayout(); this.wizardPageAdvancedSettings.SuspendLayout(); this.wizardPageSolutionInfo.SuspendLayout(); - this.wizardPageWebCommonProject.SuspendLayout(); this.wizardPageWelcome.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit(); this.wizardPageComplete.SuspendLayout(); @@ -122,6 +121,7 @@ this.wizardPageProcessing.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit(); this.wizardPageConfirmChoices.SuspendLayout(); + this.wizardPageWebCommonProject.SuspendLayout(); this.SuspendLayout(); // // imageList1 @@ -134,11 +134,6 @@ // wizard1 // this.wizard1.ContainingForm = null; - this.wizard1.Controls.Add(this.wizardPageWebProject); - this.wizard1.Controls.Add(this.wizardPageUnitTestingProject); - this.wizard1.Controls.Add(this.wizardPageSchemaExportProject); - this.wizard1.Controls.Add(this.wizardPageCoreProject); - this.wizard1.Controls.Add(this.wizardPageCommonProject); this.wizard1.Controls.Add(this.wizardPageAdvancedSettings); this.wizard1.Controls.Add(this.wizardPageSolutionInfo); this.wizard1.Controls.Add(this.wizardPageWelcome); @@ -146,6 +141,11 @@ this.wizard1.Controls.Add(this.wizardPageProcessing); this.wizard1.Controls.Add(this.wizardPageConfirmChoices); this.wizard1.Controls.Add(this.wizardPageWebCommonProject); + this.wizard1.Controls.Add(this.wizardPageWebProject); + this.wizard1.Controls.Add(this.wizardPageUnitTestingProject); + 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); @@ -487,7 +487,6 @@ this.txtAndroMDAVersion.Name = "txtAndroMDAVersion"; this.txtAndroMDAVersion.Size = new System.Drawing.Size(394, 21); this.txtAndroMDAVersion.TabIndex = 1; - this.txtAndroMDAVersion.Text = "3.2-SNAPSHOT"; // // lblUseZippedModel // @@ -678,83 +677,6 @@ this.header6.TabIndex = 26; this.header6.Title = "Application Information"; // - // wizardPageWebCommonProject - // - this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelectedImage); - this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelected); - this.wizardPageWebCommonProject.Controls.Add(this.cbConfigureWebCommonProject); - this.wizardPageWebCommonProject.Controls.Add(this.usrWebCommonProject); - this.wizardPageWebCommonProject.Controls.Add(this.header8); - this.wizardPageWebCommonProject.Dock = System.Windows.Forms.DockStyle.Fill; - this.wizardPageWebCommonProject.IsFinishPage = false; - this.wizardPageWebCommonProject.Location = new System.Drawing.Point(0, 0); - this.wizardPageWebCommonProject.Name = "wizardPageWebCommonProject"; - this.wizardPageWebCommonProject.Size = new System.Drawing.Size(525, 312); - this.wizardPageWebCommonProject.TabIndex = 10; - this.wizardPageWebCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebCommonProject_CloseFromNext); - this.wizardPageWebCommonProject.ShowFromBack += new System.EventHandler(this.wizardPageWebCommonProject_ShowFromBack); - this.wizardPageWebCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageWebCommonProject_ShowFromNext); - // - // lblMembershipSelectedImage - // - this.lblMembershipSelectedImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblMembershipSelectedImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblMembershipSelectedImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.lblMembershipSelectedImage.ImageIndex = 0; - this.lblMembershipSelectedImage.ImageList = this.imageList1; - this.lblMembershipSelectedImage.Location = new System.Drawing.Point(48, 210); - this.lblMembershipSelectedImage.Name = "lblMembershipSelectedImage"; - this.lblMembershipSelectedImage.Size = new System.Drawing.Size(35, 36); - this.lblMembershipSelectedImage.TabIndex = 36; - this.lblMembershipSelectedImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.lblMembershipSelectedImage.Visible = false; - // - // lblMembershipSelected - // - this.lblMembershipSelected.Location = new System.Drawing.Point(89, 210); - this.lblMembershipSelected.Name = "lblMembershipSelected"; - this.lblMembershipSelected.Size = new System.Drawing.Size(357, 47); - this.lblMembershipSelected.TabIndex = 35; - this.lblMembershipSelected.Text = "You selected membership support on the previous page which requires a web common " + - "project. Please enter the name of the new project or select an existing class l" + - "ibrary project."; - this.lblMembershipSelected.Visible = false; - // - // cbConfigureWebCommonProject - // - this.cbConfigureWebCommonProject.AutoSize = true; - this.cbConfigureWebCommonProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbConfigureWebCommonProject.Location = new System.Drawing.Point(12, 80); - this.cbConfigureWebCommonProject.Name = "cbConfigureWebCommonProject"; - this.cbConfigureWebCommonProject.Size = new System.Drawing.Size(202, 17); - this.cbConfigureWebCommonProject.TabIndex = 0; - this.cbConfigureWebCommonProject.Text = "Configure web common project"; - this.cbConfigureWebCommonProject.UseVisualStyleBackColor = true; - this.cbConfigureWebCommonProject.CheckedChanged += new System.EventHandler(this.cbEnableWebCommonProject_CheckedChanged); - // - // usrWebCommonProject - // - this.usrWebCommonProject.Location = new System.Drawing.Point(30, 102); - this.usrWebCommonProject.Name = "usrWebCommonProject"; - this.usrWebCommonProject.ProjectName = ""; - this.usrWebCommonProject.Size = new System.Drawing.Size(416, 93); - this.usrWebCommonProject.TabIndex = 1; - // - // header8 - // - this.header8.BackColor = System.Drawing.SystemColors.Control; - this.header8.CausesValidation = false; - this.header8.Description = "The web common project is a class library that contains web site support classes." + - ""; - this.header8.Dock = System.Windows.Forms.DockStyle.Top; - this.header8.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox; - this.header8.Location = new System.Drawing.Point(0, 0); - this.header8.Name = "header8"; - this.header8.Size = new System.Drawing.Size(525, 65); - this.header8.TabIndex = 28; - this.header8.Title = "Web Common Project"; - // // wizardPageWelcome // this.wizardPageWelcome.BackColor = System.Drawing.Color.White; @@ -1020,6 +942,83 @@ this.header4.TabIndex = 5; this.header4.Title = "Confirm Choices"; // + // wizardPageWebCommonProject + // + this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelectedImage); + this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelected); + this.wizardPageWebCommonProject.Controls.Add(this.cbConfigureWebCommonProject); + this.wizardPageWebCommonProject.Controls.Add(this.usrWebCommonProject); + this.wizardPageWebCommonProject.Controls.Add(this.header8); + this.wizardPageWebCommonProject.Dock = System.Windows.Forms.DockStyle.Fill; + this.wizardPageWebCommonProject.IsFinishPage = false; + this.wizardPageWebCommonProject.Location = new System.Drawing.Point(0, 0); + this.wizardPageWebCommonProject.Name = "wizardPageWeb... [truncated message content] |