Menu
▾
▴
andromdaplugins-cvs
|
From: Chris M. <cm...@us...> - 2006-07-27 05:45:11
|
User: cmicali
Date: 06/07/26 20:55:48
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership
MembershipServiceImpl.cs UserDaoImpl.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
pom.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards
MDASolutionWizard.designer.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS
Setup.nsi
Log:
- Reverted m2 solution wizard output to use v1.0-SNAPSHOT of the .NET cartridges
- Fixed some alignment issues on the MDASolutionWizard
- Fixed errors in the NSIS installer script
Revision Changes Path
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/MembershipServiceImpl.cs
Index: MembershipServiceImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/MembershipServiceImpl.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MembershipServiceImpl.cs 25 Jul 2006 13:09:31 -0000 1.2
+++ MembershipServiceImpl.cs 27 Jul 2006 03:55:47 -0000 1.3
@@ -152,7 +152,7 @@
UserRole role = RoleIsInList(entity.Roles, rolestring);
if (role == null)
{
- role = UserRole.Factory.NewInstance();
+ role = UserRole.Factory.newInstance();
role.Role = (Role)Enum.Parse(typeof(Role), rolestring);
role.User = entity;
entity.Roles.Add(role);
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/UserDaoImpl.cs
Index: UserDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/UserDaoImpl.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- UserDaoImpl.cs 25 Jul 2006 13:09:31 -0000 1.2
+++ UserDaoImpl.cs 27 Jul 2006 03:55:47 -0000 1.3
@@ -46,7 +46,7 @@
{
if (userVO == null) { return null; }
// VO to entity conversion
- User entity = User.Factory.NewInstance();
+ User entity = User.Factory.newInstance();
entity.Id = userVO.Id;
entity.UserName = userVO.UserName;
1.2 +3 -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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- pom.xml 25 Jul 2006 13:09:34 -0000 1.1
+++ pom.xml 27 Jul 2006 03:55:48 -0000 1.2
@@ -41,17 +41,17 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-nspring-cartridge</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-nhibernate-cartridge</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-cs-cartridge</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
1.3 +739 -739 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MDASolutionWizard.designer.cs 25 Jul 2006 13:09:33 -0000 1.2
+++ MDASolutionWizard.designer.cs 27 Jul 2006 03:55:48 -0000 1.3
@@ -32,6 +32,38 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MDASolutionWizard));
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.wizard1 = new Gui.Wizard.Wizard();
+ this.wizardPageComplete = new Gui.Wizard.WizardPage();
+ this.lnkViewLog = new System.Windows.Forms.LinkLabel();
+ this.lblFinishPageTitle = new System.Windows.Forms.Label();
+ this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
+ this.lblFinishPageDescription = new System.Windows.Forms.Label();
+ this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
+ this.txtErrorMessage = new System.Windows.Forms.TextBox();
+ this.lstLog = new System.Windows.Forms.ListBox();
+ this.wizardPageProcessing = new Gui.Wizard.WizardPage();
+ this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
+ this.lstStatus = new System.Windows.Forms.ListBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.header5 = new Gui.Wizard.Header();
+ this.wizardPageConfirmChoices = new Gui.Wizard.WizardPage();
+ this.lstChoiceOverview = new System.Windows.Forms.ListView();
+ 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.wizardPageWebProject = new Gui.Wizard.WizardPage();
+ this.cbConfigureWebProject = new System.Windows.Forms.CheckBox();
+ this.usrWebProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
+ this.lblStoreSettingsInNHibernateConfigDescription = new System.Windows.Forms.Label();
+ this.lblAddMembershipSupportText = new System.Windows.Forms.Label();
+ this.cbUseNHibernateConfig = new System.Windows.Forms.CheckBox();
+ this.cbAddMembershipSupport = new System.Windows.Forms.CheckBox();
+ this.header7 = new Gui.Wizard.Header();
this.wizardPageUnitTestingProject = new Gui.Wizard.WizardPage();
this.cbConfigureUnitTestingProject = new System.Windows.Forms.CheckBox();
this.usrTestProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
@@ -72,39 +104,14 @@
this.label2 = 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.lnkViewLog = new System.Windows.Forms.LinkLabel();
- this.lblFinishPageTitle = new System.Windows.Forms.Label();
- this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
- this.lblFinishPageDescription = new System.Windows.Forms.Label();
- this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
- this.txtErrorMessage = new System.Windows.Forms.TextBox();
- this.lstLog = new System.Windows.Forms.ListBox();
- this.wizardPageProcessing = new Gui.Wizard.WizardPage();
- this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
- this.lstStatus = new System.Windows.Forms.ListBox();
- this.label7 = new System.Windows.Forms.Label();
- this.header5 = new Gui.Wizard.Header();
- this.wizardPageConfirmChoices = new Gui.Wizard.WizardPage();
- this.lstChoiceOverview = new System.Windows.Forms.ListView();
- 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.wizardPageWebProject = new Gui.Wizard.WizardPage();
- this.cbConfigureWebProject = new System.Windows.Forms.CheckBox();
- this.usrWebProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
- this.lblStoreSettingsInNHibernateConfigDescription = new System.Windows.Forms.Label();
- this.lblAddMembershipSupportText = new System.Windows.Forms.Label();
- this.cbUseNHibernateConfig = new System.Windows.Forms.CheckBox();
- this.cbAddMembershipSupport = new System.Windows.Forms.CheckBox();
- this.header7 = new Gui.Wizard.Header();
this.wizard1.SuspendLayout();
+ this.wizardPageComplete.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
+ this.wizardPageProcessing.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
+ this.wizardPageConfirmChoices.SuspendLayout();
+ this.wizardPageWebCommonProject.SuspendLayout();
+ this.wizardPageWebProject.SuspendLayout();
this.wizardPageUnitTestingProject.SuspendLayout();
this.wizardPageSchemaExportProject.SuspendLayout();
this.wizardPageCoreProject.SuspendLayout();
@@ -113,13 +120,6 @@
this.wizardPageSolutionInfo.SuspendLayout();
this.wizardPageWelcome.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
- this.wizardPageComplete.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
- this.wizardPageProcessing.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
- this.wizardPageConfirmChoices.SuspendLayout();
- this.wizardPageWebCommonProject.SuspendLayout();
- this.wizardPageWebProject.SuspendLayout();
this.SuspendLayout();
//
// imageList1
@@ -165,834 +165,834 @@
this.wizard1.TabIndex = 0;
this.wizard1.Load += new System.EventHandler(this.wizard1_Load);
//
- // wizardPageUnitTestingProject
- //
- this.wizardPageUnitTestingProject.Controls.Add(this.cbConfigureUnitTestingProject);
- this.wizardPageUnitTestingProject.Controls.Add(this.usrTestProject);
- this.wizardPageUnitTestingProject.Controls.Add(this.header10);
- this.wizardPageUnitTestingProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageUnitTestingProject.IsFinishPage = false;
- this.wizardPageUnitTestingProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageUnitTestingProject.Name = "wizardPageUnitTestingProject";
- this.wizardPageUnitTestingProject.Size = new System.Drawing.Size(525, 312);
- this.wizardPageUnitTestingProject.TabIndex = 12;
- //
- // cbConfigureUnitTestingProject
+ // wizardPageComplete
//
- this.cbConfigureUnitTestingProject.AutoSize = true;
- this.cbConfigureUnitTestingProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbConfigureUnitTestingProject.Location = new System.Drawing.Point(12, 80);
- this.cbConfigureUnitTestingProject.Name = "cbConfigureUnitTestingProject";
- this.cbConfigureUnitTestingProject.Size = new System.Drawing.Size(192, 17);
- this.cbConfigureUnitTestingProject.TabIndex = 0;
- this.cbConfigureUnitTestingProject.Text = "Configure unit testing project";
- this.cbConfigureUnitTestingProject.UseVisualStyleBackColor = true;
- this.cbConfigureUnitTestingProject.CheckedChanged += new System.EventHandler(this.cbConfigureUnitTestingProject_CheckedChanged);
+ this.wizardPageComplete.BackColor = System.Drawing.Color.White;
+ this.wizardPageComplete.Controls.Add(this.lnkViewLog);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle);
+ this.wizardPageComplete.Controls.Add(this.pictureBoxComplete);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage);
+ this.wizardPageComplete.Controls.Add(this.txtErrorMessage);
+ this.wizardPageComplete.Controls.Add(this.lstLog);
+ this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageComplete.IsFinishPage = true;
+ this.wizardPageComplete.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageComplete.Name = "wizardPageComplete";
+ this.wizardPageComplete.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageComplete.TabIndex = 7;
+ this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
//
- // usrTestProject
+ // lnkViewLog
//
- this.usrTestProject.Location = new System.Drawing.Point(30, 102);
- this.usrTestProject.Name = "usrTestProject";
- this.usrTestProject.ProjectName = "";
- this.usrTestProject.Size = new System.Drawing.Size(416, 93);
- this.usrTestProject.TabIndex = 1;
+ this.lnkViewLog.AutoSize = true;
+ this.lnkViewLog.Location = new System.Drawing.Point(210, 111);
+ this.lnkViewLog.Name = "lnkViewLog";
+ this.lnkViewLog.Size = new System.Drawing.Size(49, 13);
+ this.lnkViewLog.TabIndex = 16;
+ this.lnkViewLog.TabStop = true;
+ this.lnkViewLog.Text = "View Log";
+ this.lnkViewLog.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
- // header10
+ // lblFinishPageTitle
//
- this.header10.BackColor = System.Drawing.SystemColors.Control;
- this.header10.CausesValidation = false;
- this.header10.Description = "You can have this wizard create or configure a project to contain unit tests for " +
- "your business layer.";
- this.header10.Dock = System.Windows.Forms.DockStyle.Top;
- this.header10.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header10.Location = new System.Drawing.Point(0, 0);
- this.header10.Name = "header10";
- this.header10.Size = new System.Drawing.Size(525, 65);
- this.header10.TabIndex = 5;
- this.header10.Title = "Testing Project";
+ 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;
//
- // wizardPageSchemaExportProject
+ // pictureBoxComplete
//
- this.wizardPageSchemaExportProject.Controls.Add(this.cbCreateSchemaExport);
- this.wizardPageSchemaExportProject.Controls.Add(this.txtSchemaExportProject);
- this.wizardPageSchemaExportProject.Controls.Add(this.lblDescription);
- this.wizardPageSchemaExportProject.Controls.Add(this.header3);
- this.wizardPageSchemaExportProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageSchemaExportProject.IsFinishPage = false;
- this.wizardPageSchemaExportProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageSchemaExportProject.Name = "wizardPageSchemaExportProject";
- this.wizardPageSchemaExportProject.Size = new System.Drawing.Size(525, 312);
- this.wizardPageSchemaExportProject.TabIndex = 4;
- this.wizardPageSchemaExportProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSchemaExportProject_CloseFromNext);
- this.wizardPageSchemaExportProject.ShowFromBack += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext);
- this.wizardPageSchemaExportProject.ShowFromNext += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext);
+ this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pictureBoxComplete.Image = global::AndroMDA.VS80AddIn.Resource1.orange;
+ this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxComplete.Name = "pictureBoxComplete";
+ this.pictureBoxComplete.Size = new System.Drawing.Size(164, 312);
+ this.pictureBoxComplete.TabIndex = 13;
+ this.pictureBoxComplete.TabStop = false;
//
- // cbCreateSchemaExport
+ // lblFinishPageDescription
//
- 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, 80);
- this.cbCreateSchemaExport.Name = "cbCreateSchemaExport";
- this.cbCreateSchemaExport.Size = new System.Drawing.Size(196, 17);
- this.cbCreateSchemaExport.TabIndex = 0;
- this.cbCreateSchemaExport.Text = "Create schema export project";
- this.cbCreateSchemaExport.UseVisualStyleBackColor = true;
- this.cbCreateSchemaExport.CheckedChanged += new System.EventHandler(this.cbCreateSchemaExport_CheckedChanged);
+ this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49);
+ this.lblFinishPageDescription.Name = "lblFinishPageDescription";
+ this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 62);
+ this.lblFinishPageDescription.TabIndex = 12;
+ this.lblFinishPageDescription.Text = "Your solution has been updated successfully and now supports AndroMDA code genera" +
+ "tion. You can now add classes to the solution model file and generate code base" +
+ "d on the model.\r\n";
//
- // txtSchemaExportProject
+ // lblFinishPageTitleImage
//
- this.txtSchemaExportProject.Enabled = false;
- this.txtSchemaExportProject.Location = new System.Drawing.Point(30, 102);
- this.txtSchemaExportProject.Name = "txtSchemaExportProject";
- this.txtSchemaExportProject.Size = new System.Drawing.Size(394, 21);
- this.txtSchemaExportProject.TabIndex = 1;
- this.txtSchemaExportProject.Text = "SchemaExport";
+ this.lblFinishPageTitleImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblFinishPageTitleImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblFinishPageTitleImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+ this.lblFinishPageTitleImage.ImageIndex = 0;
+ this.lblFinishPageTitleImage.ImageList = this.imageList1;
+ this.lblFinishPageTitleImage.Location = new System.Drawing.Point(170, 9);
+ this.lblFinishPageTitleImage.Name = "lblFinishPageTitleImage";
+ this.lblFinishPageTitleImage.Size = new System.Drawing.Size(49, 36);
+ this.lblFinishPageTitleImage.TabIndex = 11;
+ this.lblFinishPageTitleImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
- // lblDescription
+ // txtErrorMessage
//
- this.lblDescription.Location = new System.Drawing.Point(13, 92);
- this.lblDescription.Name = "lblDescription";
- this.lblDescription.Size = new System.Drawing.Size(507, 26);
- this.lblDescription.TabIndex = 24;
+ this.txtErrorMessage.BackColor = System.Drawing.Color.White;
+ this.txtErrorMessage.Location = new System.Drawing.Point(174, 49);
+ this.txtErrorMessage.Multiline = true;
+ this.txtErrorMessage.Name = "txtErrorMessage";
+ this.txtErrorMessage.ReadOnly = true;
+ this.txtErrorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+ this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
+ this.txtErrorMessage.TabIndex = 14;
//
- // header3
+ // lstLog
//
- this.header3.BackColor = System.Drawing.SystemColors.Control;
- this.header3.CausesValidation = false;
- this.header3.Description = "Check the box below if you would like to create a project that contains a console" +
- " application that generates database schema from your model. ";
- this.header3.Dock = System.Windows.Forms.DockStyle.Top;
- this.header3.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header3.Location = new System.Drawing.Point(0, 0);
- this.header3.Name = "header3";
- this.header3.Size = new System.Drawing.Size(525, 65);
- this.header3.TabIndex = 4;
- this.header3.Title = "Schema Export Project";
+ this.lstLog.FormattingEnabled = true;
+ this.lstLog.HorizontalScrollbar = true;
+ this.lstLog.Location = new System.Drawing.Point(174, 49);
+ this.lstLog.Name = "lstLog";
+ this.lstLog.Size = new System.Drawing.Size(339, 251);
+ this.lstLog.TabIndex = 17;
+ this.lstLog.Visible = false;
//
- // wizardPageCoreProject
+ // wizardPageProcessing
//
- this.wizardPageCoreProject.Controls.Add(this.header2);
- this.wizardPageCoreProject.Controls.Add(this.usrCoreProject);
- this.wizardPageCoreProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageCoreProject.IsFinishPage = false;
- this.wizardPageCoreProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageCoreProject.Name = "wizardPageCoreProject";
- this.wizardPageCoreProject.Size = new System.Drawing.Size(525, 312);
- this.wizardPageCoreProject.TabIndex = 3;
- this.wizardPageCoreProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCoreProject_CloseFromNext);
- this.wizardPageCoreProject.ShowFromNext += new System.EventHandler(this.wizardPageCoreProject_ShowFromNext);
+ this.wizardPageProcessing.Controls.Add(this.pictureBoxThrobber);
+ 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, 312);
+ this.wizardPageProcessing.TabIndex = 6;
+ this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
//
- // header2
+ // pictureBoxThrobber
//
- this.header2.BackColor = System.Drawing.SystemColors.Control;
- this.header2.CausesValidation = false;
- this.header2.Description = "The core project, also known as the domain project, contains all entities and dat" +
- "a access objects generated from your model.";
- this.header2.Dock = System.Windows.Forms.DockStyle.Top;
- this.header2.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header2.Location = new System.Drawing.Point(0, 0);
- this.header2.Name = "header2";
- this.header2.Size = new System.Drawing.Size(525, 65);
- this.header2.TabIndex = 3;
- this.header2.Title = "Core Project";
+ this.pictureBoxThrobber.BackColor = System.Drawing.Color.Transparent;
+ this.pictureBoxThrobber.Image = global::AndroMDA.VS80AddIn.Resource1.indicator_arrows;
+ this.pictureBoxThrobber.Location = new System.Drawing.Point(227, 77);
+ this.pictureBoxThrobber.Name = "pictureBoxThrobber";
+ this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 17);
+ this.pictureBoxThrobber.TabIndex = 10;
+ this.pictureBoxThrobber.TabStop = false;
//
- // usrCoreProject
+ // lstStatus
//
- this.usrCoreProject.Location = new System.Drawing.Point(12, 79);
- this.usrCoreProject.Name = "usrCoreProject";
- this.usrCoreProject.ProjectName = "";
- this.usrCoreProject.Size = new System.Drawing.Size(462, 100);
- this.usrCoreProject.TabIndex = 0;
+ 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, 199);
+ this.lstStatus.TabIndex = 9;
//
- // wizardPageCommonProject
+ // label7
//
- this.wizardPageCommonProject.Controls.Add(this.usrCommonProject);
- this.wizardPageCommonProject.Controls.Add(this.header1);
- this.wizardPageCommonProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageCommonProject.IsFinishPage = false;
- this.wizardPageCommonProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageCommonProject.Name = "wizardPageCommonProject";
- this.wizardPageCommonProject.Size = new System.Drawing.Size(525, 312);
- this.wizardPageCommonProject.TabIndex = 2;
- this.wizardPageCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCommonProject_CloseFromNext);
- this.wizardPageCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageCommonProject_ShowFromNext);
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(12, 77);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(209, 13);
+ this.label7.TabIndex = 8;
+ this.label7.Text = "Updating solution to support AndroMDA...";
//
- // usrCommonProject
+ // header5
//
- this.usrCommonProject.Location = new System.Drawing.Point(12, 79);
- this.usrCommonProject.Name = "usrCommonProject";
- this.usrCommonProject.ProjectName = "";
- this.usrCommonProject.Size = new System.Drawing.Size(446, 98);
- this.usrCommonProject.TabIndex = 0;
+ this.header5.BackColor = System.Drawing.SystemColors.Control;
+ this.header5.CausesValidation = false;
+ this.header5.Description = "Please wait...";
+ this.header5.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header5.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
+ 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";
//
- // header1
+ // wizardPageConfirmChoices
//
- this.header1.BackColor = System.Drawing.SystemColors.Control;
- this.header1.CausesValidation = false;
- this.header1.Description = "The common project contains value objects, enumerations, and other non-entity cla" +
- "sses that are generated from your model.";
- this.header1.Dock = System.Windows.Forms.DockStyle.Top;
- this.header1.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header1.Location = new System.Drawing.Point(0, 0);
- this.header1.Name = "header1";
- this.header1.Size = new System.Drawing.Size(525, 65);
- this.header1.TabIndex = 0;
- this.header1.Title = "Common Project";
+ this.wizardPageConfirmChoices.Controls.Add(this.lstChoiceOverview);
+ this.wizardPageConfirmChoices.Controls.Add(this.header4);
+ this.wizardPageConfirmChoices.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageConfirmChoices.IsFinishPage = false;
+ this.wizardPageConfirmChoices.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageConfirmChoices.Name = "wizardPageConfirmChoices";
+ this.wizardPageConfirmChoices.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageConfirmChoices.TabIndex = 5;
+ this.wizardPageConfirmChoices.ShowFromNext += new System.EventHandler(this.wizardPageConfirmChoices_ShowFromNext);
//
- // wizardPageAdvancedSettings
+ // lstChoiceOverview
//
- this.wizardPageAdvancedSettings.Controls.Add(this.txtAndroMDAVersion);
- this.wizardPageAdvancedSettings.Controls.Add(this.lblUseZippedModel);
- this.wizardPageAdvancedSettings.Controls.Add(this.label6);
- this.wizardPageAdvancedSettings.Controls.Add(this.ddlAndroMDABootstrap);
- this.wizardPageAdvancedSettings.Controls.Add(this.label5);
- this.wizardPageAdvancedSettings.Controls.Add(this.lblUseZippedModelDescription);
- this.wizardPageAdvancedSettings.Controls.Add(this.cbUseZippedModel);
- this.wizardPageAdvancedSettings.Controls.Add(this.header9);
- this.wizardPageAdvancedSettings.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageAdvancedSettings.IsFinishPage = false;
- this.wizardPageAdvancedSettings.Location = new System.Drawing.Point(0, 0);
- this.wizardPageAdvancedSettings.Name = "wizardPageAdvancedSettings";
- this.wizardPageAdvancedSettings.Size = new System.Drawing.Size(525, 312);
- this.wizardPageAdvancedSettings.TabIndex = 11;
- this.wizardPageAdvancedSettings.ShowFromBack += new System.EventHandler(this.wizardPageAdvancedSettings_ShowFromBack);
- this.wizardPageAdvancedSettings.ShowFromNext += new System.EventHandler(this.wizardPageAdvancedSettings_ShowFromNext);
+ this.lstChoiceOverview.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.columnHeader1,
+ this.columnHeader2});
+ this.lstChoiceOverview.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+ this.lstChoiceOverview.Location = new System.Drawing.Point(12, 71);
+ this.lstChoiceOverview.Name = "lstChoiceOverview";
+ this.lstChoiceOverview.Size = new System.Drawing.Size(501, 228);
+ this.lstChoiceOverview.TabIndex = 6;
+ this.lstChoiceOverview.UseCompatibleStateImageBehavior = false;
+ this.lstChoiceOverview.View = System.Windows.Forms.View.Details;
//
- // txtAndroMDAVersion
+ // columnHeader1
//
- this.txtAndroMDAVersion.BackColor = System.Drawing.SystemColors.Window;
- this.txtAndroMDAVersion.Location = new System.Drawing.Point(30, 151);
- this.txtAndroMDAVersion.Name = "txtAndroMDAVersion";
- this.txtAndroMDAVersion.Size = new System.Drawing.Size(394, 21);
- this.txtAndroMDAVersion.TabIndex = 1;
- this.txtAndroMDAVersion.Text = "3.2-SNAPSHOT";
+ this.columnHeader1.Text = "Feature";
+ this.columnHeader1.Width = 236;
//
- // lblUseZippedModel
+ // columnHeader2
//
- this.lblUseZippedModel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblUseZippedModel.Location = new System.Drawing.Point(9, 181);
- this.lblUseZippedModel.Name = "lblUseZippedModel";
- this.lblUseZippedModel.Size = new System.Drawing.Size(507, 16);
- this.lblUseZippedModel.TabIndex = 32;
- this.lblUseZippedModel.Text = "Do you want to use a zipped model file?";
+ this.columnHeader2.Text = "Value";
+ this.columnHeader2.Width = 235;
//
- // label6
+ // header4
//
- this.label6.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label6.Location = new System.Drawing.Point(9, 130);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(507, 16);
- this.label6.TabIndex = 32;
- this.label6.Text = "What version of AndroMDA should your project use?";
+ this.header4.BackColor = System.Drawing.SystemColors.Control;
+ this.header4.CausesValidation = false;
+ this.header4.Description = "Please confirm the choices you have selected. Click Next to begin processing you" +
+ "r solution.";
+ this.header4.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header4.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
+ this.header4.Location = new System.Drawing.Point(0, 0);
+ this.header4.Name = "header4";
+ this.header4.Size = new System.Drawing.Size(525, 65);
+ this.header4.TabIndex = 5;
+ this.header4.Title = "Confirm Choices";
//
- // ddlAndroMDABootstrap
+ // wizardPageWebCommonProject
//
- this.ddlAndroMDABootstrap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.ddlAndroMDABootstrap.FormattingEnabled = true;
- this.ddlAndroMDABootstrap.Items.AddRange(new object[] {
- "Apache Maven 2.x",
- "Apache Maven 1.x"});
- this.ddlAndroMDABootstrap.Location = new System.Drawing.Point(30, 102);
- this.ddlAndroMDABootstrap.Name = "ddlAndroMDABootstrap";
- this.ddlAndroMDABootstrap.Size = new System.Drawing.Size(394, 21);
- this.ddlAndroMDABootstrap.TabIndex = 0;
- this.ddlAndroMDABootstrap.SelectedIndexChanged += new System.EventHandler(this.ddlAndroMDABootstrap_SelectedIndexChanged);
+ 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);
//
- // label5
+ // lblMembershipSelectedImage
//
- this.label5.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label5.Location = new System.Drawing.Point(9, 81);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(507, 16);
- this.label5.TabIndex = 30;
- this.label5.Text = "Which program should your project use to launch AndroMDA?";
+ 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;
//
- // lblUseZippedModelDescription
+ // lblMembershipSelected
//
- this.lblUseZippedModelDescription.Location = new System.Drawing.Point(27, 220);
- this.lblUseZippedModelDescription.Name = "lblUseZippedModelDescription";
- this.lblUseZippedModelDescription.Size = new System.Drawing.Size(428, 30);
- this.lblUseZippedModelDescription.TabIndex = 29;
- this.lblUseZippedModelDescription.Text = "This option will instruct the wizard to emit the empty model as an XMI file insid" +
- "e a zip file, instead of plain XMI file";
+ 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;
//
- // cbUseZippedModel
+ // cbConfigureWebCommonProject
//
- this.cbUseZippedModel.AutoSize = true;
- this.cbUseZippedModel.Enabled = false;
- this.cbUseZippedModel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbUseZippedModel.Location = new System.Drawing.Point(30, 201);
- this.cbUseZippedModel.Name = "cbUseZippedModel";
- this.cbUseZippedModel.Size = new System.Drawing.Size(126, 17);
- this.cbUseZippedModel.TabIndex = 2;
- this.cbUseZippedModel.Text = "Use zipped model file";
- this.cbUseZippedModel.UseVisualStyleBackColor = true;
+ 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);
//
- // header9
+ // usrWebCommonProject
//
- this.header9.BackColor = System.Drawing.SystemColors.Control;
- this.header9.CausesValidation = false;
- this.header9.Description = "You can fine tune the output of the solution wizard with these settings.";
- this.header9.Dock = System.Windows.Forms.DockStyle.Top;
- this.header9.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header9.Location = new System.Drawing.Point(0, 0);
- this.header9.Name = "header9";
- this.header9.Size = new System.Drawing.Size(525, 65);
- this.header9.TabIndex = 27;
- this.header9.Title = "Advanced Settings";
+ 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;
//
- // wizardPageSolutionInfo
+ // header8
//
- this.wizardPageSolutionInfo.Controls.Add(this.cbShowAdvancedOptions);
- this.wizardPageSolutionInfo.Controls.Add(this.ddlVersionControl);
- this.wizardPageSolutionInfo.Controls.Add(this.ddlDatabaseType);
- this.wizardPageSolutionInfo.Controls.Add(this.label10);
- this.wizardPageSolutionInfo.Controls.Add(this.label1);
- this.wizardPageSolutionInfo.Controls.Add(this.label17);
- this.wizardPageSolutionInfo.Controls.Add(this.txtApplicationName);
- this.wizardPageSolutionInfo.Controls.Add(this.label12);
- this.wizardPageSolutionInfo.Controls.Add(this.header6);
- this.wizardPageSolutionInfo.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageSolutionInfo.IsFinishPage = false;
- this.wizardPageSolutionInfo.Location = new System.Drawing.Point(0, 0);
- this.wizardPageSolutionInfo.Name = "wizardPageSolutionInfo";
- this.wizardPageSolutionInfo.Size = new System.Drawing.Size(525, 312);
- this.wizardPageSolutionInfo.TabIndex = 8;
- this.wizardPageSolutionInfo.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSolutionInfo_CloseFromNext);
- this.wizardPageSolutionInfo.ShowFromBack += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
- this.wizardPageSolutionInfo.ShowFromNext += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
+ 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";
//
- // cbShowAdvancedOptions
+ // wizardPageWebProject
//
- this.cbShowAdvancedOptions.AutoSize = true;
- this.cbShowAdvancedOptions.Location = new System.Drawing.Point(30, 250);
- this.cbShowAdvancedOptions.Name = "cbShowAdvancedOptions";
- this.cbShowAdvancedOptions.Size = new System.Drawing.Size(140, 17);
- this.cbShowAdvancedOptions.TabIndex = 3;
- this.cbShowAdvancedOptions.Text = "Show advanced options";
- this.cbShowAdvancedOptions.UseVisualStyleBackColor = true;
+ this.wizardPageWebProject.Controls.Add(this.cbConfigureWebProject);
+ this.wizardPageWebProject.Controls.Add(this.usrWebProject);
+ this.wizardPageWebProject.Controls.Add(this.lblStoreSettingsInNHibernateConfigDescription);
+ this.wizardPageWebProject.Controls.Add(this.lblAddMembershipSupportText);
+ this.wizardPageWebProject.Controls.Add(this.cbUseNHibernateConfig);
+ this.wizardPageWebProject.Controls.Add(this.cbAddMembershipSupport);
+ this.wizardPageWebProject.Controls.Add(this.header7);
+ this.wizardPageWebProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageWebProject.IsFinishPage = false;
+ this.wizardPageWebProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageWebProject.Name = "wizardPageWebProject";
+ this.wizardPageWebProject.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageWebProject.TabIndex = 9;
+ this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext);
+ this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext);
//
- // ddlVersionControl
+ // cbConfigureWebProject
//
- this.ddlVersionControl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.ddlVersionControl.FormattingEnabled = true;
- this.ddlVersionControl.Items.AddRange(new object[] {
- "None",
- "CVS"});
- this.ddlVersionControl.Location = new System.Drawing.Point(30, 201);
- this.ddlVersionControl.Name = "ddlVersionControl";
- this.ddlVersionControl.Size = new System.Drawing.Size(394, 21);
- this.ddlVersionControl.TabIndex = 2;
+ this.cbConfigureWebProject.AutoSize = true;
+ this.cbConfigureWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbConfigureWebProject.Location = new System.Drawing.Point(12, 80);
+ this.cbConfigureWebProject.Name = "cbConfigureWebProject";
+ this.cbConfigureWebProject.Size = new System.Drawing.Size(150, 17);
+ this.cbConfigureWebProject.TabIndex = 0;
+ this.cbConfigureWebProject.Text = "Configure web project";
+ this.cbConfigureWebProject.UseVisualStyleBackColor = true;
+ this.cbConfigureWebProject.CheckedChanged += new System.EventHandler(this.cbAddWebProjectSupport_CheckedChanged);
//
- // ddlDatabaseType
+ // usrWebProject
//
- this.ddlDatabaseType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.ddlDatabaseType.FormattingEnabled = true;
- this.ddlDatabaseType.Items.AddRange(new object[] {
- "Microsoft SQL Server",
- "MySQL",
- "Oracle 9i",
- "Hypersonic"});
- this.ddlDatabaseType.Location = new System.Drawing.Point(30, 152);
- this.ddlDatabaseType.Name = "ddlDatabaseType";
- this.ddlDatabaseType.Size = new System.Drawing.Size(394, 21);
- this.ddlDatabaseType.TabIndex = 1;
+ this.usrWebProject.Location = new System.Drawing.Point(30, 102);
+ this.usrWebProject.Name = "usrWebProject";
+ this.usrWebProject.ProjectName = "";
+ this.usrWebProject.Size = new System.Drawing.Size(431, 93);
+ this.usrWebProject.TabIndex = 1;
+ this.usrWebProject.WebProjectMode = true;
//
- // label10
+ // lblStoreSettingsInNHibernateConfigDescription
//
- this.label10.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label10.Location = new System.Drawing.Point(9, 230);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(507, 16);
- this.label10.TabIndex = 6;
- this.label10.Text = "Would you like to configure specific versions of Maven, AndroMDA, etc?";
+ this.lblStoreSettingsInNHibernateConfigDescription.Location = new System.Drawing.Point(47, 221);
+ this.lblStoreSettingsInNHibernateConfigDescription.Name = "lblStoreSettingsInNHibernateConfigDescription";
+ this.lblStoreSettingsInNHibernateConfigDescription.Size = new System.Drawing.Size(428, 30);
+ this.lblStoreSettingsInNHibernateConfigDescription.TabIndex = 3;
+ this.lblStoreSettingsInNHibernateConfigDescription.Text = "This options stores the database connection settings in nhibernate.config instead" +
+ " of the web.config";
+ this.lblStoreSettingsInNHibernateConfigDescription.Click += new System.EventHandler(this.lblStoreSettingsInNHibernateConfigDescription_Click);
//
- // label1
+ // lblAddMembershipSupportText
//
- 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(9, 179);
- 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?";
+ this.lblAddMembershipSupportText.Location = new System.Drawing.Point(47, 273);
+ this.lblAddMembershipSupportText.Name = "lblAddMembershipSupportText";
+ this.lblAddMembershipSupportText.Size = new System.Drawing.Size(428, 30);
+ this.lblAddMembershipSupportText.TabIndex = 3;
+ this.lblAddMembershipSupportText.Text = "This options adds users and roles to the UML model and the DomainMembershipProvid" +
+ "er to the solution for ASP.NET Membership support.";
//
- // label17
+ // cbUseNHibernateConfig
//
- 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(9, 130);
- this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(507, 16);
- this.label17.TabIndex = 4;
- this.label17.Text = "Which database server will your application use?";
+ this.cbUseNHibernateConfig.AutoSize = true;
+ this.cbUseNHibernateConfig.Checked = true;
+ this.cbUseNHibernateConfig.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbUseNHibernateConfig.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbUseNHibernateConfig.Location = new System.Drawing.Point(30, 204);
+ this.cbUseNHibernateConfig.Name = "cbUseNHibernateConfig";
+ this.cbUseNHibernateConfig.Size = new System.Drawing.Size(221, 17);
+ this.cbUseNHibernateConfig.TabIndex = 2;
+ this.cbUseNHibernateConfig.Text = "Store settings in nhibernate.config";
+ this.cbUseNHibernateConfig.UseVisualStyleBackColor = true;
+ this.cbUseNHibernateConfig.CheckedChanged += new System.EventHandler(this.cbAddMembershipSupport_CheckedChanged);
//
- // txtApplicationName
+ // cbAddMembershipSupport
//
- this.txtApplicationName.BackColor = System.Drawing.SystemColors.Window;
- this.txtApplicationName.Location = new System.Drawing.Point(30, 103);
- this.txtApplicationName.Name = "txtApplicationName";
- this.txtApplicationName.Size = new System.Drawing.Size(394, 21);
- this.txtApplicationName.TabIndex = 0;
+ this.cbAddMembershipSupport.AutoSize = true;
+ this.cbAddMembershipSupport.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbAddMembershipSupport.Location = new System.Drawing.Point(30, 256);
+ this.cbAddMembershipSupport.Name = "cbAddMembershipSupport";
+ this.cbAddMembershipSupport.Size = new System.Drawing.Size(169, 17);
+ this.cbAddMembershipSupport.TabIndex = 2;
+ this.cbAddMembershipSupport.Text = "Add membership support";
+ this.cbAddMembershipSupport.UseVisualStyleBackColor = true;
+ this.cbAddMembershipSupport.CheckedChanged += new System.EventHandler(this.cbAddMembershipSupport_CheckedChanged);
//
- // label12
+ // header7
//
- this.label12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label12.Location = new System.Drawing.Point(9, 81);
- this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(507, 16);
- this.label12.TabIndex = 0;
- this.label12.Text = "What is the name of your application? (Example: Time Tracker)";
+ this.header7.BackColor = System.Drawing.SystemColors.Control;
+ this.header7.CausesValidation = false;
+ this.header7.Description = "This wizard can either create or update a web site to support NHibernate";
+ this.header7.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header7.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
+ this.header7.Location = new System.Drawing.Point(0, 0);
+ this.header7.Name = "header7";
+ this.header7.Size = new System.Drawing.Size(525, 65);
+ this.header7.TabIndex = 27;
+ this.header7.Title = "Web Project";
//
- // header6
+ // wizardPageUnitTestingProject
//
- this.header6.BackColor = System.Drawing.SystemColors.Control;
- this.header6.CausesValidation = false;
- this.header6.Description = "Please enter the following general information about your applicaiton.";
- this.header6.Dock = System.Windows.Forms.DockStyle.Top;
- this.header6.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header6.Location = new System.Drawing.Point(0, 0);
- this.header6.Name = "header6";
- this.header6.Size = new System.Drawing.Size(525, 65);
- this.header6.TabIndex = 26;
- this.header6.Title = "Application Information";
+ this.wizardPageUnitTestingProject.Controls.Add(this.cbConfigureUnitTestingProject);
+ this.wizardPageUnitTestingProject.Controls.Add(this.usrTestProject);
+ this.wizardPageUnitTestingProject.Controls.Add(this.header10);
+ this.wizardPageUnitTestingProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageUnitTestingProject.IsFinishPage = false;
+ this.wizardPageUnitTestingProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPa...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2006-08-22 02:14:01
|
User: cmicali
Date: 06/08/21 19:14:00
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
AboutDialog.cs AboutDialog.designer.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven
Maven1Proxy.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages
AboutOptionsPage.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml
empty.model.membership.xml empty.model.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
pom.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
VS80AddIn.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn Android VS Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS
Setup.nsi
Log:
- Updated version to 1.4.1
- Added download statusbar to maven 1 proxy
- Fixed andromda versions in empty models
Revision Changes Path
1.6 +5 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.cs
Index: AboutDialog.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- AboutDialog.cs 25 Jul 2006 13:09:30 -0000 1.5
+++ AboutDialog.cs 22 Aug 2006 02:13:59 -0000 1.6
@@ -90,5 +90,10 @@
button1.Focus();
}
+ private void panel1_Paint(object sender, PaintEventArgs e)
+ {
+
+ }
+
}
}
\ No newline at end of file
1.7 +1 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.designer.cs
Index: AboutDialog.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.designer.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- AboutDialog.designer.cs 25 Jul 2006 13:09:30 -0000 1.6
+++ AboutDialog.designer.cs 22 Aug 2006 02:13:59 -0000 1.7
@@ -53,6 +53,7 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(394, 34);
this.panel1.TabIndex = 3;
+ this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
//
// aboutOptionsPage1
//
1.3 +13 -8 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven/Maven1Proxy.cs
Index: Maven1Proxy.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven/Maven1Proxy.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Maven1Proxy.cs 31 Jul 2006 21:05:18 -0000 1.2
+++ Maven1Proxy.cs 22 Aug 2006 02:13:59 -0000 1.3
@@ -53,17 +53,22 @@
private void ProcessOutput(ref string text, ref bool cancelOutput)
{
if (text == string.Empty) return;
- // Filter out the full java strack trace from any errors that occur when maven runs
- if (text.Trim()[0] == '\t' || text.Contains(".java:") || text.Contains("(Native Method)"))
+ else
+ {
+ if (text.EndsWith("K"))
+ {
+ string[] t = text.Split('/');
+ if (t.Length == 2)
{
+ int current = int.Parse(t[0]);
+ int total = int.Parse(t[1].Remove(t[1].Length - 1));
+ OutputWindow.DTE.StatusBar.Progress(true, "AndroMDA: Maven: Downloading file... " + text, current, total);
cancelOutput = true;
}
- else
- {
- if (text.Contains("'jar:file:"))
+ }
+ else if (text.EndsWith("K downloaded"))
{
- // Get rid of the jar: prefix from URLs so we don't scare the .NET people
- text = text.Replace("'jar:file:", "'file:");
+ OutputWindow.DTE.StatusBar.Progress(false, "Android/VS: Generation Progress", 0, 0);
}
}
}
1.4 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.cs
Index: AboutOptionsPage.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AboutOptionsPage.cs 30 Jul 2006 05:33:25 -0000 1.3
+++ AboutOptionsPage.cs 22 Aug 2006 02:14:00 -0000 1.4
@@ -139,7 +139,7 @@
richTextBox1.Rtf = @"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fswiss\fcharset0 Arial;}}
{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\qc\f0\par\fs36 Android/VS\par
-\fs20 AndroMDA integration for Visual Studio 2005\par
+\fs20 Visual Studio 2005 integration for AndroMDA \par
\par
(c)2006 AndroMDA - http://www.andromda.org/\par
\par
1.2 +70 -70 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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- empty.model.membership.xml 9 Jun 2006 22:27:24 -0000 1.1
+++ empty.model.membership.xml 22 Aug 2006 02:14:00 -0000 1.2
@@ -3,7 +3,7 @@
<UML:Namespace.ownedElement>
<UML:Class xmi.id='_9_5_1_874026a_1147797358974_560038_4' name='User'>
<UML:ModelElement.stereotype>
- <UML:Stereotype href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
+ <UML:Stereotype href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::persistence::Entity'/>
</XMI.extension>
@@ -13,7 +13,7 @@
<UML:TaggedValue xmi.id='_9_5_1_874026a_1147802781652_96551_1178' name='@andromda.persistence.table'>
<UML:TaggedValue.dataValue>AppUser</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_846703_8'>
+ <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>
@@ -24,7 +24,7 @@
<UML:Classifier.feature>
<UML:Attribute xmi.id='_9_5_1_874026a_1147802173958_223149_613' name='userName' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -34,7 +34,7 @@
<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-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
+ <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>
@@ -44,7 +44,7 @@
<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-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_54372_83'>
+ <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>
@@ -55,7 +55,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1147802183922_246121_617' name='password' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -65,7 +65,7 @@
<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-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
+ <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>
@@ -75,7 +75,7 @@
<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-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_54372_83'>
+ <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>
@@ -86,7 +86,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1147802201317_473762_665' name='email' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -96,7 +96,7 @@
<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-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
+ <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>
@@ -106,7 +106,7 @@
<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-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_54372_83'>
+ <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>
@@ -117,7 +117,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1147802206795_951750_668' name='isActive' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::boolean'/>
</XMI.extension>
@@ -127,7 +127,7 @@
<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-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
+ <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>
@@ -145,7 +145,7 @@
</UML:Multiplicity>
</UML:StructuralFeature.multiplicity>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -155,7 +155,7 @@
<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-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
+ <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>
@@ -165,7 +165,7 @@
<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-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_54372_83'>
+ <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>
@@ -176,7 +176,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1147974187300_531457_3' name='creationDate' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_195604_13'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_195604_13'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::Date'/>
</XMI.extension>
@@ -186,7 +186,7 @@
<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-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
+ <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>
@@ -199,7 +199,7 @@
</UML:Class>
<UML:Class xmi.id='_9_5_1_874026a_1147797367717_238216_5' name='UserRole'>
<UML:ModelElement.stereotype>
- <UML:Stereotype href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
+ <UML:Stereotype href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::persistence::Entity'/>
</XMI.extension>
@@ -209,7 +209,7 @@
<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-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_846703_8'>
+ <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>
@@ -223,7 +223,7 @@
<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-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_246379_63'>
+ <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>
@@ -236,7 +236,7 @@
</UML:Class>
<UML:Class xmi.id='_9_5_1_874026a_1147801720876_670493_267' name='Role'>
<UML:ModelElement.stereotype>
- <UML:Stereotype href='andromda-profile-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119373197267_700962_14'>
+ <UML:Stereotype href='andromda-profile-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119373197267_700962_14'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::Enumeration'/>
</XMI.extension>
@@ -245,7 +245,7 @@
<UML:Classifier.feature>
<UML:Attribute xmi.id='_9_5_1_874026a_1147802518884_27362_719' name='standardUser' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -254,7 +254,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1147802526695_713798_721' name='administrator' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -286,7 +286,7 @@
<UML:TaggedValue xmi.id='_9_5_1_874026a_1148341647857_961267_171' name='@andromda.hibernate.cascade'>
<UML:TaggedValue.dataValue>all-delete-orphan</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_2_1fe00f9_1123571135734_378565_0'>
+ <UML:TagDefinition href='andromda-profile-persistence-${wizard.application.andromda.version}.xml.zip|_9_0_2_1fe00f9_1123571135734_378565_0'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::persistence::@andromda.hibernate.cascade'/>
</XMI.extension>
@@ -305,7 +305,7 @@
<UML:Namespace.ownedElement>
<UML:Class xmi.id='_9_5_1_874026a_1147802008009_352337_395' name='MembershipService'>
<UML:ModelElement.stereotype>
- <UML:Stereotype href='andromda-profile-service-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337557859_21792_59'>
+ <UML:Stereotype href='andromda-profile-service-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119337557859_21792_59'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::service::Service'/>
</XMI.extension>
@@ -316,7 +316,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147818437313_652043_1208' name='username'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -325,7 +325,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147818437313_111873_1209' name='password'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -340,7 +340,7 @@
<UML:Parameter xmi.id='_9_5_1_874026a_1147976092966_111790_251' name='user' type='_9_5_1_874026a_1148487426786_832415_417'/>
<UML:Parameter xmi.id='_9_5_1_874026a_1148409544341_249421_854' name='password'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -349,7 +349,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1148409544341_846015_855' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_324247_52'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_324247_52'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::void'/>
</XMI.extension>
@@ -362,7 +362,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147976063845_813774_234' name='userId'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_238790_9'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_238790_9'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::long'/>
</XMI.extension>
@@ -376,7 +376,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147818472344_979196_1214' name='username'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -390,7 +390,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147818104555_365514_1203' name='pageIndex'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_213222_11'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_213222_11'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::int'/>
</XMI.extension>
@@ -399,7 +399,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147818105116_646652_1204' name='pageSize'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_213222_11'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_213222_11'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::int'/>
</XMI.extension>
@@ -408,7 +408,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147902956618_550158_195' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_809265_8'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_809265_8'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::List'/>
</XMI.extension>
@@ -421,7 +421,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147979409946_483341_309' name='email'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -430,7 +430,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147979409946_297391_310' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -443,7 +443,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1148412326511_123294_859' name='username'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -452,7 +452,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1148413672366_291811_879' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_238790_9'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_238790_9'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::long'/>
</XMI.extension>
@@ -466,7 +466,7 @@
<UML:Parameter xmi.id='_9_5_1_874026a_1147976044210_739954_197' name='user' type='_9_5_1_874026a_1148487426786_832415_417'/>
<UML:Parameter xmi.id='_9_5_1_874026a_1148495457319_97703_575' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_324247_52'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_324247_52'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::void'/>
</XMI.extension>
@@ -479,7 +479,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1148575948183_983496_3' name='username'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -488,7 +488,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1148576034638_616749_92' name='oldPassword'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -497,7 +497,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1148576034638_936188_93' name='newPassword'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -506,7 +506,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1148576055007_692908_95' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::boolean'/>
</XMI.extension>
@@ -519,7 +519,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147975918209_579730_110' name='username'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -528,7 +528,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147977687459_582692_272' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_324247_52'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_324247_52'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::void'/>
</XMI.extension>
@@ -541,7 +541,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147975992105_880822_190' name='emailToMatch'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -550,7 +550,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147975966589_710425_135' name='pageIndex'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_213222_11'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_213222_11'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::int'/>
</XMI.extension>
@@ -559,7 +559,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147975966589_807987_136' name='pageSize'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_213222_11'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_213222_11'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::int'/>
</XMI.extension>
@@ -568,7 +568,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147975992105_169574_191' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_809265_8'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_809265_8'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::List'/>
</XMI.extension>
@@ -581,7 +581,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147976005655_673725_192' name='usernameToMatch'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -590,7 +590,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147975968511_606266_170' name='pageIndex'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_213222_11'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_213222_11'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::int'/>
</XMI.extension>
@@ -599,7 +599,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147975968511_107330_171' name='pageSize'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_213222_11'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_213222_11'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::int'/>
</XMI.extension>
@@ -608,7 +608,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1147976005655_42032_193' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_809265_8'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_809265_8'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::List'/>
</XMI.extension>
@@ -621,7 +621,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1148326581273_345655_3' name='userId'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_238790_9'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_238790_9'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::long'/>
</XMI.extension>
@@ -635,7 +635,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1148326593951_107418_8' name='username'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -650,7 +650,7 @@
<UML:Parameter xmi.id='_9_5_1_874026a_1148327017500_584892_14' name='role' type='_9_5_1_874026a_1147801720876_670493_267'/>
<UML:Parameter xmi.id='_9_5_1_874026a_1148327036397_507358_31' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_132353_2'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_132353_2'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String[]'/>
</XMI.extension>
@@ -664,7 +664,7 @@
<UML:Parameter xmi.id='_9_5_1_874026a_1148327094871_413042_47' name='role' type='_9_5_1_874026a_1147801720876_670493_267'/>
<UML:Parameter xmi.id='_9_5_1_874026a_1148327108711_372380_66' name='usernameToMatch'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -673,7 +673,7 @@
</UML:Parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1148327108711_62262_67' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_132353_2'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_132353_2'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String[]'/>
</XMI.extension>
@@ -688,7 +688,7 @@
<UML:Parameter xmi.id='_9_5_1_874026a_1148334352066_382674_165' name='role' type='_9_5_1_874026a_1147801720876_670493_267'/>
<UML:Parameter xmi.id='_9_5_1_874026a_1148495467303_103786_576' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::boolean'/>
</XMI.extension>
@@ -701,7 +701,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_874026a_1148334336174_589522_158' name='username'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -711,7 +711,7 @@
<UML:Parameter xmi.id='_9_5_1_874026a_1148334336174_400024_159' name='role' type='_9_5_1_874026a_1147801720876_670493_267'/>
<UML:Parameter xmi.id='_9_5_1_874026a_1148334336174_501450_160' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::boolean'/>
</XMI.extension>
@@ -730,7 +730,7 @@
<UML:Namespace.ownedElement>
<UML:Class xmi.id='_9_5_1_874026a_1148487426786_832415_417' name='UserVO'>
<UML:ModelElement.stereotype>
- <UML:Stereotype href='andromda-profile-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119373197267_59537_10'>
+ <UML:Stereotype href='andromda-profile-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119373197267_59537_10'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::ValueObject'/>
</XMI.extension>
@@ -739,7 +739,7 @@
<UML:Classifier.feature>
<UML:Attribute xmi.id='_9_5_1_874026a_1148495926794_522853_607' name='id' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_238790_9'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_238790_9'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::long'/>
</XMI.extension>
@@ -748,7 +748,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1148487426786_138215_410' name='userName' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -757,7 +757,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1148487426786_665430_412' name='email' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -766,7 +766,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1148487426786_427150_413' name='isActive' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::boolean'/>
</XMI.extension>
@@ -775,7 +775,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1148487426786_292890_414' name='comment' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -784,7 +784,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1148487426786_48120_416' name='creationDate' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_195604_13'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_195604_13'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::Date'/>
</XMI.extension>
@@ -793,7 +793,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_874026a_1148496190262_965541_609' name='roles' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_132353_2'>
+ <UML:Classifier href='andromda-profile-datatype-${wizard.application.andromda.version}.xml.zip|_9_0_1fe00f9_1119336925531_132353_2'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String[]'/>
</XMI.extension>
1.4 +10 -10 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml/empty.model.xml
Index: empty.model.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml/empty.model.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- empty.model.xml 30 Jul 2006 05:33:26 -0000 1.3
+++ empty.model.xml 22 Aug 2006 02:14:00 -0000 1.4
@@ -56,43 +56,43 @@
<propertyID>MODULES_DIRS</propertyID>
<propertyDescriptionID>MODULES_DIRS_DESCRIPTION</propertyDescriptionID>
<mdElement elementClass='FileProperty'>
- <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile\3.2-SNAPSHOT\</value>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile\${wizard.application.andromda.version}\</value>
<selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-datatype\3.2-SNAPSHOT\</value>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-datatype\${wizard.application.andromda.version}\</value>
<selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-meta\3.2-SNAPSHOT\</value>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-meta\${wizard.application.andromda.version}\</value>
<selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-persistence\3.2-SNAPSHOT\</value>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-persistence\${wizard.application.andromda.version}\</value>
<selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-presentation\3.2-SNAPSHOT\</value>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-presentation\${wizard.application.andromda.version}\</value>
<selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-process\3.2-SNAPSHOT\</value>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-process\${wizard.application.andromda.version}\</value>
<selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-service\3.2-SNAPSHOT\</value>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-service\${wizard.application.andromda.version}\</value>
<selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profiles-uml14\3.2-SNAPSHOT\</value>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profiles-uml14\${wizard.application.andromda.version}\</value>
<selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-webservice\3.2-SNAPSHOT\</value>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-webservice\${wizard.application.andromda.version}\</value>
...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2006-09-28 20:28:43
|
User: cmicali
Date: 06/09/28 13:28:42
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AddInSettings.cs MDASolutionManager.cs VS80AddIn.cs
WizardSolutionProcessor.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
OpenModelCommand.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Controls
MDAProjectSetupControl.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
AboutDialog.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages
SolutionExplorerOptionsPage.Designer.cs
SolutionExplorerOptionsPage.cs
SolutionExplorerOptionsPage.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Lib
AndroMDA.NHibernateSupport.dll
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
pom.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
VSSolutionUtils.cs
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 version to 1.5
- Updated AndroMDA.NhibernateSupport.dll to v1.0.6.0 (fixed issue with SchemaExport)
- Added support for the ASP.NET cartridge
- Added support for PostgreSQL in the solution wizard
- Removed dependency on core/common projects
- Resync now 30% faster
- Resync now works across all projects in the solution
- Options page added to modify the sync folders list (defaults to src and target)
- Web projects are now properly resynced after an andromda generate
- Bug fixed on resync when projects were unavailable in the solution explorer
Revision Changes Path
1.14 +34 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AddInSettings.cs
Index: AddInSettings.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AddInSettings.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- AddInSettings.cs 30 Jul 2006 05:33:25 -0000 1.13
+++ AddInSettings.cs 28 Sep 2006 20:28:39 -0000 1.14
@@ -25,7 +25,7 @@
public const string SETTING_NAME_PREFIX = "ARDV";
- public const int ADDIN_SETTINGS_VERSION = 9;
+ public const int ADDIN_SETTINGS_VERSION = 10;
#region Member variables
@@ -45,6 +45,7 @@
FirstRun = false;
AddInBuild = ADDIN_SETTINGS_VERSION;
ResyncIgnoreList = "CVS;.cvsignore;.svn;.svnignore;_svn";
+ SyncFolderList = "src;target";
ResyncIgnoreHiddenFiles = false;
MavenUseOfflineMode = true;
MavenCleanFirst = true;
@@ -56,6 +57,7 @@
}
if (AddInBuild < ADDIN_SETTINGS_VERSION)
{
+ SyncFolderList = "src;target";
AddInBuild = ADDIN_SETTINGS_VERSION;
}
}
@@ -115,6 +117,12 @@
set { m_settings[SETTING_NAME_PREFIX + "IgnoreLst"] = value; }
}
+ public string SyncFolderList
+ {
+ get { return m_settings[SETTING_NAME_PREFIX + "SyncLst"]; }
+ set { m_settings[SETTING_NAME_PREFIX + "SyncLst"] = value; }
+ }
+
public bool ResyncIgnoreHiddenFiles
{
get { return m_settings.GetBool(SETTING_NAME_PREFIX + "RIHdnFl", false); }
@@ -350,6 +358,30 @@
return false;
}
+ public bool IsInSyncFoldersList(string folderPath)
+ {
+ return IsInSyncFoldersList(folderPath, true);
+ }
+
+ public bool IsInSyncFoldersList(string folderPath, bool stripPath)
+ {
+ // Get the list of files to ignore
+ string[] syncFolders = SyncFolderList.Split(new char[] { ';' });
+
+ // Make the file name lowercase and trim space off the ends
+ folderPath = folderPath.Trim().ToLower().Replace('\\', '/').Trim('/');
+
+ // Iterate through the ignored files
+ foreach (string folder in syncFolders)
+ {
+ string folderCleaned = folder.Trim().ToLower().Replace('\\', '/').Trim('/');
+ if (folderPath.EndsWith(folderCleaned))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
#endregion
}
1.17 +147 -120 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.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- MDASolutionManager.cs 27 Jul 2006 02:11:54 -0000 1.16
+++ MDASolutionManager.cs 28 Sep 2006 20:28:39 -0000 1.17
@@ -37,8 +37,8 @@
private AddInSettings m_addInSettings = null;
- private MDAProject m_coreProject = null;
- private MDAProject m_commonProject = null;
+ //private MDAProject m_coreProject = null;
+ //private MDAProject m_commonProject = null;
private MDAProject m_schemaExportProject = null;
private bool m_restartBuild = false;
@@ -69,6 +69,7 @@
}
}
+ /*
public MDAProject CoreProject
{
get { return m_coreProject; }
@@ -78,6 +79,7 @@
{
get { return m_commonProject; }
}
+ */
public MDAProject SchemaExportProject
{
@@ -234,8 +236,8 @@
//// Resolve the core and common projects
////
- m_coreProject = null;
- m_commonProject = null;
+ //m_coreProject = null;
+ //m_commonProject = null;
m_schemaExportProject = null;
// Iterate through the projects and search for the core and common directories
@@ -246,6 +248,7 @@
// Get the project's directory
string projectPath = FileUtils.GetPathFromFilename(p.FileName);
+ /*
// Check if the current (core) directory is the same as the project directory
if (FileUtils.CompareDirectories(projectPath, m_projectProperties.GetPath("maven.andromda.core.dir")))
{
@@ -263,6 +266,7 @@
string generatedPath = m_projectProperties.GetPath("maven.andromda.common.generated.dir");
m_commonProject = new MDAProject(p, FileUtils.GetFilename(projectPath), projectPath, generatedPath, string.Empty);
}
+ */
// Check if the current (schemaexport) directory is the same as the project directory
if (IsSchemaExportProjectAvailable && FileUtils.CompareDirectories(projectPath, m_projectProperties.GetPath("maven.andromda.schemaexport.dir")))
@@ -277,6 +281,7 @@
// Swallow this exception (it means the project was not loaded for some reason)
}
}
+ /*
// Show an error message if either the core or common projects could not be found
if (m_coreProject == null || m_commonProject == null)
{
@@ -292,6 +297,7 @@
errorMessage += " could not be found in the solution.";
throw new Exception(errorMessage);
}
+ */
m_solutionSettings = new ConfigFile(solutionPath + "\\mda\\android.user.properties");
m_applicationObject.StatusBar.Highlight(false);
m_applicationObject.StatusBar.Text = "Android/VS: AndroMDA configuration loaded.";
@@ -468,6 +474,7 @@
try
{
DoRefreshGeneratedFiles();
+ m_applicationObject.StatusBar.Text = "Android/VS: Solution resync complete";
}
catch (Exception e)
{
@@ -480,86 +487,66 @@
}
}
- private void CheckGeneratedPaths(MDAProject proj)
+ private void DoRefreshGeneratedFiles()
{
- if (proj.ManualPathProjectItem == null && proj.ManualRelativePath.Length > 0)
+ m_progress = 0;
+ UpdateResyncProgressBar();
+
+ string[] syncFolders = m_addInSettings.SyncFolderList.Split(new char[] { ';' });
+
+ foreach (Project proj in m_applicationObject.Solution.Projects)
{
- if (System.IO.Directory.Exists(proj.ManualPath))
+ if (proj.Kind == VSSolutionUtils.ProjectKindSolutionFolder || proj.Object == null)
{
- proj.Project.ProjectItems.AddFromDirectory(proj.ManualPath);
+ // The project is either unavailable or a solution folder
}
- else
+ else if (proj.Kind == VSSolutionUtils.ProjectKindWeb)
{
- proj.Project.ProjectItems.AddFolder(proj.ManualRelativePath, EnvDTE.Constants.vsProjectItemKindPhysicalFolder);
- }
- }
- if (proj.GeneratedPathProjectItem == null && proj.GeneratedRelativePath.Length > 0)
- {
- if (System.IO.Directory.Exists(proj.GeneratedPath))
- {
- proj.Project.ProjectItems.AddFromDirectory(proj.GeneratedPath);
+ VsWebSite.VSWebSite webSite = proj.Object as VsWebSite.VSWebSite;
+ webSite.Refresh();
}
else
{
- proj.Project.ProjectItems.AddFolder(proj.GeneratedRelativePath, EnvDTE.Constants.vsProjectItemKindPhysicalFolder);
- }
- }
- }
+ UpdateResyncProgressBar(proj.Name);
- private void DoRefreshGeneratedFiles()
+ // Search for the existing
+ foreach (string folder in syncFolders)
{
- m_progress = 0;
- UpdateResyncProgressBar();
-
- CheckGeneratedPaths(m_commonProject);
- CheckGeneratedPaths(m_coreProject);
-
- // Sync common/src
- ResyncFolder(m_commonProject.ManualPathProjectItem, m_commonProject.ManualPath, m_commonProject.Name);
- // Sync common/target
- ResyncFolder(m_commonProject.GeneratedPathProjectItem, m_commonProject.GeneratedPath, m_commonProject.Name);
- // Sync core/src
- ResyncFolder(m_coreProject.ManualPathProjectItem, m_coreProject.ManualPath, m_coreProject.Name);
- // Sync core/target
- ResyncFolder(m_coreProject.GeneratedPathProjectItem, m_coreProject.GeneratedPath, m_coreProject.Name);
-
- m_applicationObject.StatusBar.Progress(false, "Android/VS: Resync complete", 1, 1);
-
+ string folderPath = proj.Properties.Item("FullPath").Value.ToString().Trim('\\');
+ folderPath = folderPath + "\\" + folder.Replace('/', '\\').Trim('\\');
+ if (System.IO.Directory.Exists(folderPath))
+ {
+ proj.ProjectItems.AddFromDirectory(folderPath);
+ }
}
- private void ResyncFolder(ProjectItem item, string folderPath, string projectName)
+ foreach (ProjectItem item in proj.ProjectItems)
{
- if (item == null) return;
-
- UpdateResyncProgressBar(projectName + "/" + item.Name);
-
- // Get the UI nodes from the solution explorer
- // so we can collapse the project trees and make it look neat
- // when we are finished (it's faster when they are closed too)
- UIHierarchy solutionExplorer = (UIHierarchy)m_applicationObject.Windows.Item(Constants.vsext_wk_SProjectWindow).Object;
- UIHierarchyItem uiCommonProject = null;
- UIHierarchyItem uiCoreProject = null;
- foreach (UIHierarchyItem rootUIItems in solutionExplorer.UIHierarchyItems)
+ if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFolder)
{
- foreach (UIHierarchyItem uiItem in rootUIItems.UIHierarchyItems)
+ string folderPath = item.Properties.Item("FullPath").Value.ToString();
+ if (m_addInSettings.IsInSyncFoldersList(folderPath))
{
- if (uiItem.Name == m_coreProject.Name) { uiCoreProject = uiItem; }
- if (uiItem.Name == m_commonProject.Name) { uiCommonProject = uiItem; }
- if (uiCoreProject != null && uiCommonProject != null) { break; }
+ ResyncFolder(item, proj.Name);
+ }
+ }
+ }
+ }
}
- if (uiCoreProject != null && uiCommonProject != null) { break; }
}
- // Collapse the projects in the solution explorer (this makes this operation much faster)
- CollapseProject(uiCoreProject);
- CollapseProject(uiCommonProject);
+ private void ResyncFolder(ProjectItem folderProjectItem, string projectName)
+ {
+ if (folderProjectItem == null) return;
- UpdateResyncProgressBar("Getting file list for " + projectName + "/" + item.Name);
+ string folderPath = folderProjectItem.Properties.Item("FullPath").Value.ToString();
+
+ UpdateResyncProgressBar("Getting file list for " + projectName + "/" + folderProjectItem.Name);
// Get the list of files in the filesystem
ArrayList filesystemFileList = GetFileListFromFilesystem(folderPath);
// Get the list of files in the solution tree
- ArrayList solutionTreeFileList = GetFileListFromProjectTree(item);
+ ArrayList solutionTreeFileList = GetFileListFromProjectTree(folderProjectItem);
// Generate a hash for the filesystem list
int filesHash = GetArrayListHashCode(filesystemFileList);
// Generate a hash for the solution tree list
@@ -568,31 +555,40 @@
// 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 + "/" + item.Name);
+ UpdateResyncProgressBar("Files have not changed since last resync: " + projectName + "/" + folderProjectItem.Name, 1, 1);
return;
}
- // The hash codes are different, so we need to sync the solution tree
- // to the filesystem
- UpdateResyncProgressBar("Removing all files from " + projectName + "/" + item.Name);
-
- // Remove all files from the project
- RemoveAllChildren(item);
-
- // Collapse the projects again (VS opens them when you make changes)
- CollapseProject(uiCoreProject);
- CollapseProject(uiCommonProject);
-
- UpdateResyncProgressBar(projectName + "/" + item.Name);
-
- // Add the files from the filesystem into the solution
- // The filesystemFileList has already been filtered for ignored items
- // Also note that this list contains all files in all subdirectories
- int fileNum = 0;
- foreach (string file in filesystemFileList)
+ CollapseProject(projectName);
+ RemoveIgnoredItems(folderProjectItem.ProjectItems, filesystemFileList.Count);
+ UpdateResyncProgressBar(projectName + "/" + folderProjectItem.Name);
+ }
+
+ private void RemoveIgnoredItems(ProjectItems items, int totalItems)
+ {
+ RemoveIgnoredItems(items, 0, totalItems);
+ }
+
+ private int RemoveIgnoredItems(ProjectItems items, int currentItem, int totalItems)
+ {
+ foreach (ProjectItem item in items)
+ {
+ if (m_addInSettings.IsInIgnoreList(item.Name))
+ {
+ item.Remove();
+ }
+ else
+ {
+ if (item.ProjectItems != null && item.ProjectItems.Count > 0)
+ {
+ currentItem++;
+ currentItem = RemoveIgnoredItems(item.ProjectItems, currentItem, totalItems);
+ }
+ else
{
- ProjectItem newItem = item.ProjectItems.AddFromFile(file);
- Property prop = newItem.Properties.Item("BuildAction");
+ UpdateResyncProgressBar(item.Name, currentItem++, totalItems);
+ string file = item.Name;
+ Property prop = item.Properties.Item("BuildAction");
if (file.ToLower().Trim().EndsWith(".hbm.xml"))
{
prop.Value = VSLangProj.prjBuildAction.prjBuildActionEmbeddedResource;
@@ -601,40 +597,55 @@
{
prop.Value = VSLangProj.prjBuildAction.prjBuildActionCompile;
}
- UpdateResyncProgressBar(file, fileNum++, filesystemFileList.Count);
}
-
- // Collapse the projects one more time
- CollapseProject(uiCoreProject);
- CollapseProject(uiCommonProject);
-
- UpdateResyncProgressBar(projectName + "/" + item.Name);
-
+ }
+ }
+ return currentItem;
}
private bool IsSolutionSynchronizedWithFileSystem()
{
- // Check common/src
- if (!IsSolutionSynchronizedWithFileSystem(m_commonProject.ManualPathProjectItem, m_commonProject.ManualPath))
- return false;
- // Check common/target
- if (!IsSolutionSynchronizedWithFileSystem(m_commonProject.GeneratedPathProjectItem, m_commonProject.GeneratedPath))
- return false;
- // Check core/src
- if (!IsSolutionSynchronizedWithFileSystem(m_coreProject.ManualPathProjectItem, m_coreProject.ManualPath))
- return false;
- // Check core/target
- if (!IsSolutionSynchronizedWithFileSystem(m_coreProject.GeneratedPathProjectItem, m_coreProject.GeneratedPath))
+ string[] syncFolders = m_addInSettings.SyncFolderList.Split(new char[] { ';' });
+ foreach (Project proj in m_applicationObject.Solution.Projects)
+ {
+ if (proj.Kind != VSSolutionUtils.ProjectKindSolutionFolder &&
+ proj.Kind != VSSolutionUtils.ProjectKindWeb)
+ {
+ UpdateResyncProgressBar(proj.Name);
+ // Search for the existing
+ foreach (string folder in syncFolders)
+ {
+ string folderPath = proj.Properties.Item("FullPath").Value.ToString().Trim('\\');
+ folderPath = folderPath + "\\" + folder.Replace('/', '\\').Trim('\\');
+ if (System.IO.Directory.Exists(folderPath))
+ {
+ proj.ProjectItems.AddFromDirectory(folderPath);
+ }
+ }
+ foreach (ProjectItem item in proj.ProjectItems)
+ {
+ if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFolder)
+ {
+ string folderPath = item.Properties.Item("FullPath").Value.ToString();
+ if (m_addInSettings.IsInSyncFoldersList(folderPath))
+ {
+ if (!IsSolutionSynchronizedWithFileSystem(item))
return false;
+ }
+ }
+ }
+ }
+ }
return true;
}
- private bool IsSolutionSynchronizedWithFileSystem(ProjectItem item, string folderPath)
+ private bool IsSolutionSynchronizedWithFileSystem(ProjectItem folderProjectItem)
{
+ string folderPath = folderProjectItem.Properties.Item("FullPath").Value.ToString();
// Get the list of files in the filesystem
ArrayList filesystemFileList = GetFileListFromFilesystem(folderPath);
// Get the list of files in the solution tree
- ArrayList solutionTreeFileList = GetFileListFromProjectTree(item);
+ ArrayList solutionTreeFileList = GetFileListFromProjectTree(folderProjectItem);
// Generate a hash for the filesystem list
int filesHash = GetArrayListHashCode(filesystemFileList);
// Generate a hash for the solution tree list
@@ -730,17 +741,15 @@
return filesList;
}
- private void RemoveAllChildren(ProjectItem item)
+ private void CollapseProject(string projectName)
{
-
- // Remove all the items in the project folder
- foreach (ProjectItem childItem in item.ProjectItems)
+ UIHierarchy solutionExplorer = (UIHierarchy)m_applicationObject.Windows.Item(Constants.vsext_wk_SProjectWindow).Object;
+ foreach (UIHierarchyItem rootUIItems in solutionExplorer.UIHierarchyItems)
{
- if (childItem.ProjectItems != null && childItem.ProjectItems.Count > 0)
+ foreach (UIHierarchyItem uiItem in rootUIItems.UIHierarchyItems)
{
- RemoveAllChildren(childItem);
+ if (uiItem.Name == projectName) { CollapseProject(uiItem); break; }
}
- childItem.Remove();
}
}
@@ -776,7 +785,7 @@
private void UpdateResyncProgressBar(string detail)
{
- UpdateResyncProgressBar(detail, m_progress++, 20);
+ UpdateResyncProgressBar(detail, 0, 1);
}
private void UpdateResyncProgressBar(string detail, int currentProgress, int totalProgress)
@@ -785,6 +794,7 @@
{
detail = "(" + detail + ")";
}
+ if (currentProgress > totalProgress) currentProgress = totalProgress;
m_applicationObject.StatusBar.Progress(true, "Android/VS: Refreshing generated files... " + detail, currentProgress, totalProgress);
}
@@ -839,8 +849,25 @@
ArrayList stats = new ArrayList();
if (IsEnabled)
{
- Hashtable files = CollectFiles(m_coreProject.GeneratedPathProjectItem);
- MergeHashtable(files, CollectFiles(m_commonProject.GeneratedPathProjectItem));
+ Hashtable files = new Hashtable();// CollectFiles(m_coreProject.GeneratedPathProjectItem);
+ foreach (Project proj in m_applicationObject.Solution.Projects)
+ {
+ if (proj.Object != null &&
+ proj.Kind != VSSolutionUtils.ProjectKindSolutionFolder)
+ {
+ foreach (ProjectItem item in proj.ProjectItems)
+ {
+ if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFolder)
+ {
+ string folderPath = item.Properties.Item("FullPath").Value.ToString();
+ if (m_addInSettings.IsInSyncFoldersList(folderPath))
+ {
+ MergeHashtable(files, CollectFiles(item));
+ }
+ }
+ }
+ }
+ }
stats.Add(new SolutionStatistic("Files Generated", files.Count.ToString("N0"), SolutionStatistic.Group.FileStatistics));
stats.Add(new SolutionStatistic("Lines of Code Generated", GetTotalLOC(files).ToString("N0"), SolutionStatistic.Group.FileStatistics));
1.16 +1 -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.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- VS80AddIn.cs 22 Aug 2006 02:14:00 -0000 1.15
+++ VS80AddIn.cs 28 Sep 2006 20:28:39 -0000 1.16
@@ -20,7 +20,7 @@
public class VS80AddIn
{
- public const string ADD_IN_VERSION = "1.4.1";
+ public const string ADD_IN_VERSION = "1.5";
#region Constants
1.14 +6 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs
Index: WizardSolutionProcessor.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- WizardSolutionProcessor.cs 25 Jul 2006 13:09:28 -0000 1.13
+++ WizardSolutionProcessor.cs 28 Sep 2006 20:28:39 -0000 1.14
@@ -110,6 +110,9 @@
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";
+
//////////////////////////////////
// Create/find the common project
if (GetConfigSettingBool("projects.common.create"))
@@ -420,6 +423,9 @@
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
1.10 +2 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/OpenModelCommand.cs
Index: OpenModelCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/OpenModelCommand.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- OpenModelCommand.cs 25 Jul 2006 13:09:29 -0000 1.9
+++ OpenModelCommand.cs 28 Sep 2006 20:28:39 -0000 1.10
@@ -39,7 +39,8 @@
System.IO.File.SetAttributes(m_solutionManager.ModelFilePath, attr);
}
}
- System.Diagnostics.Process.Start(magicDrawPath, m_solutionManager.ModelFilePath);
+ //AddInUtils.ShowWarning("Path: " + magicDrawPath + "\nArgs: " + "\"" + m_solutionManager.ModelFilePath + "\"");
+ System.Diagnostics.Process.Start(magicDrawPath, "\"" + m_solutionManager.ModelFilePath + "\"");
}
catch (Exception e)
{
1.3 +2 -3 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Controls/MDAProjectSetupControl.cs
Index: MDAProjectSetupControl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Controls/MDAProjectSetupControl.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MDAProjectSetupControl.cs 25 Jul 2006 13:09:30 -0000 1.2
+++ MDAProjectSetupControl.cs 28 Sep 2006 20:28:39 -0000 1.3
@@ -121,7 +121,6 @@
public void OnEnter(object sender, EventArgs e, DTE applicationObject)
{
- string webProjectKind = "{E24C65DC-7377-472b-9ABA-BC803B73C61A}";
if (m_firstEnter)
{
m_firstEnter = false;
@@ -130,8 +129,8 @@
foreach (Project p in applicationObject.Solution.Projects)
{
if (
- (m_webProjectMode && p.Kind == webProjectKind) ||
- (!m_webProjectMode && p.Kind != webProjectKind)
+ (m_webProjectMode && p.Kind == VSSolutionUtils.ProjectKindWeb) ||
+ (!m_webProjectMode && p.Kind != VSSolutionUtils.ProjectKindWeb)
)
{
1.7 +2 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.cs
Index: AboutDialog.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs/AboutDialog.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- AboutDialog.cs 22 Aug 2006 02:13:59 -0000 1.6
+++ AboutDialog.cs 28 Sep 2006 20:28:40 -0000 1.7
@@ -54,6 +54,7 @@
{
aboutOptionsPage1.Reset();
aboutOptionsPage1.SolutionUsingMDA = "Yes";
+ /*
if (m_solutionManager.CommonProject != null)
{
aboutOptionsPage1.CommonProject = m_solutionManager.CommonProject.Name;
@@ -66,6 +67,7 @@
{
aboutOptionsPage1.SchemaExportProject = m_solutionManager.SchemaExportProject.Name;
}
+ */
string modelFile = m_solutionManager.ModelFilePath;
modelFile = modelFile.Replace(m_solutionManager.SolutionPath, string.Empty);
int position = modelFile.LastIndexOf('!');
1.2 +96 -8 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/SolutionExplorerOptionsPage.Designer.cs
Index: SolutionExplorerOptionsPage.Designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/SolutionExplorerOptionsPage.Designer.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- SolutionExplorerOptionsPage.Designer.cs 12 Jul 2006 09:15:08 -0000 1.1
+++ SolutionExplorerOptionsPage.Designer.cs 28 Sep 2006 20:28:40 -0000 1.2
@@ -36,7 +36,14 @@
this.btnAddResyncIgnoreItem = new System.Windows.Forms.Button();
this.lstResyncIgnoreList = new System.Windows.Forms.ListBox();
this.txtResyncIgnoreList = new System.Windows.Forms.TextBox();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.btnDeleteSyncFolderItem = new System.Windows.Forms.Button();
+ this.btnAddSyncFolderItem = new System.Windows.Forms.Button();
+ this.lstSyncFolders = new System.Windows.Forms.ListBox();
+ this.txtSyncFolder = new System.Windows.Forms.TextBox();
this.groupBox2.SuspendLayout();
+ this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// groupBox2
@@ -47,13 +54,12 @@
this.groupBox2.Controls.Add(this.btnAddResyncIgnoreItem);
this.groupBox2.Controls.Add(this.lstResyncIgnoreList);
this.groupBox2.Controls.Add(this.txtResyncIgnoreList);
- this.groupBox2.Dock = System.Windows.Forms.DockStyle.Top;
- this.groupBox2.Location = new System.Drawing.Point(0, 0);
+ this.groupBox2.Location = new System.Drawing.Point(0, 145);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(395, 174);
+ this.groupBox2.Size = new System.Drawing.Size(395, 135);
this.groupBox2.TabIndex = 3;
this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Files to exclude from solution explorer";
+ this.groupBox2.Text = "Folders and files to exclude";
//
// label1
//
@@ -67,11 +73,11 @@
// cbIgnoreHiddenFiles
//
this.cbIgnoreHiddenFiles.AutoSize = true;
- this.cbIgnoreHiddenFiles.Location = new System.Drawing.Point(6, 146);
+ this.cbIgnoreHiddenFiles.Location = new System.Drawing.Point(181, 110);
this.cbIgnoreHiddenFiles.Name = "cbIgnoreHiddenFiles";
- this.cbIgnoreHiddenFiles.Size = new System.Drawing.Size(192, 17);
+ this.cbIgnoreHiddenFiles.Size = new System.Drawing.Size(188, 17);
this.cbIgnoreHiddenFiles.TabIndex = 4;
- this.cbIgnoreHiddenFiles.Text = "E&xclude hidden files and directories";
+ this.cbIgnoreHiddenFiles.Text = "E&xclude all hidden folders and files";
this.cbIgnoreHiddenFiles.UseVisualStyleBackColor = true;
//
// btnDeleteResyncIgnoreItem
@@ -110,7 +116,7 @@
this.lstResyncIgnoreList.FormattingEnabled = true;
this.lstResyncIgnoreList.Location = new System.Drawing.Point(6, 19);
this.lstResyncIgnoreList.Name = "lstResyncIgnoreList";
- this.lstResyncIgnoreList.Size = new System.Drawing.Size(166, 121);
+ this.lstResyncIgnoreList.Size = new System.Drawing.Size(166, 108);
this.lstResyncIgnoreList.TabIndex = 0;
this.lstResyncIgnoreList.SelectedIndexChanged += new System.EventHandler(this.lstResyncIgnoreList_SelectedIndexChanged);
//
@@ -123,15 +129,91 @@
this.txtResyncIgnoreList.TabIndex = 1;
this.txtResyncIgnoreList.TextChanged += new System.EventHandler(this.txtResyncIgnoreList_TextChanged);
//
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.label2);
+ this.groupBox1.Controls.Add(this.btnDeleteSyncFolderItem);
+ this.groupBox1.Controls.Add(this.btnAddSyncFolderItem);
+ this.groupBox1.Controls.Add(this.lstSyncFolders);
+ this.groupBox1.Controls.Add(this.txtSyncFolder);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.groupBox1.Location = new System.Drawing.Point(0, 0);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(395, 136);
+ this.groupBox1.TabIndex = 4;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Folders to auto-synchronize";
+ //
+ // label2
+ //
+ this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label2.Location = new System.Drawing.Point(178, 71);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(205, 30);
+ this.label2.TabIndex = 5;
+ this.label2.Text = "Note: Items added to this list are case insensitive";
+ //
+ // btnDeleteSyncFolderItem
+ //
+ this.btnDeleteSyncFolderItem.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnDeleteSyncFolderItem.Enabled = false;
+ this.btnDeleteSyncFolderItem.Image = ((System.Drawing.Image)(resources.GetObject("btnDeleteSyncFolderItem.Image")));
+ this.btnDeleteSyncFolderItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.btnDeleteSyncFolderItem.Location = new System.Drawing.Point(242, 45);
+ this.btnDeleteSyncFolderItem.Name = "btnDeleteSyncFolderItem";
+ this.btnDeleteSyncFolderItem.Size = new System.Drawing.Size(65, 23);
+ this.btnDeleteSyncFolderItem.TabIndex = 3;
+ this.btnDeleteSyncFolderItem.Text = "&Delete";
+ this.btnDeleteSyncFolderItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.btnDeleteSyncFolderItem.UseVisualStyleBackColor = true;
+ this.btnDeleteSyncFolderItem.Click += new System.EventHandler(this.btnDeleteSyncFolderItem_Click);
+ //
+ // btnAddSyncFolderItem
+ //
+ this.btnAddSyncFolderItem.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnAddSyncFolderItem.Image = ((System.Drawing.Image)(resources.GetObject("btnAddSyncFolderItem.Image")));
+ this.btnAddSyncFolderItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.btnAddSyncFolderItem.Location = new System.Drawing.Point(181, 45);
+ this.btnAddSyncFolderItem.Name = "btnAddSyncFolderItem";
+ this.btnAddSyncFolderItem.Size = new System.Drawing.Size(55, 23);
+ this.btnAddSyncFolderItem.TabIndex = 2;
+ this.btnAddSyncFolderItem.Text = "&Add";
+ this.btnAddSyncFolderItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.btnAddSyncFolderItem.UseVisualStyleBackColor = true;
+ this.btnAddSyncFolderItem.Click += new System.EventHandler(this.btnAddSyncFolderItem_Click);
+ //
+ // lstSyncFolders
+ //
+ this.lstSyncFolders.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lstSyncFolders.FormattingEnabled = true;
+ this.lstSyncFolders.Location = new System.Drawing.Point(6, 19);
+ this.lstSyncFolders.Name = "lstSyncFolders";
+ this.lstSyncFolders.Size = new System.Drawing.Size(166, 108);
+ this.lstSyncFolders.TabIndex = 0;
+ this.lstSyncFolders.SelectedIndexChanged += new System.EventHandler(this.lstSyncFolders_SelectedIndexChanged);
+ //
+ // txtSyncFolder
+ //
+ this.txtSyncFolder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtSyncFolder.Location = new System.Drawing.Point(181, 19);
+ this.txtSyncFolder.Name = "txtSyncFolder";
+ this.txtSyncFolder.Size = new System.Drawing.Size(202, 20);
+ this.txtSyncFolder.TabIndex = 1;
+ this.txtSyncFolder.TextChanged += new System.EventHandler(this.txtSyncFolder_TextChanged);
+ //
// SolutionExplorerOptionsPage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
this.Name = "SolutionExplorerOptionsPage";
this.Size = new System.Drawing.Size(395, 289);
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
@@ -145,6 +227,12 @@
private System.Windows.Forms.ListBox lstResyncIgnoreList;
private System.Windows.Forms.TextBox txtResyncIgnoreList;
private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Button btnDeleteSyncFolderItem;
+ private System.Windows.Forms.Button btnAddSyncFolderItem;
+ private System.Windows.Forms.ListBox lstSyncFolders;
+ private System.Windows.Forms.TextBox txtSyncFolder;
}
}
1.3 +48 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/SolutionExplorerOptionsPage.cs
Index: SolutionExplorerOptionsPage.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/SolutionExplorerOptionsPage.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- SolutionExplorerOptionsPage.cs 25 Jul 2006 13:09:31 -0000 1.2
+++ SolutionExplorerOptionsPage.cs 28 Sep 2006 20:28:40 -0000 1.3
@@ -51,12 +51,26 @@
txtResyncIgnoreList.Text = string.Empty;
btnAddResyncIgnoreItem.Enabled = false;
btnDeleteResyncIgnoreItem.Enabled = false;
+
cbIgnoreHiddenFiles.Checked = m_settings.ResyncIgnoreHiddenFiles;
+
+ lstSyncFolders.Items.Clear();
+ if (m_settings.SyncFolderList.Length > 0)
+ {
+ string[] list = m_settings.SyncFolderList.Split(new char[] { ';' });
+ foreach (string item in list)
+ {
+ if (item.Length > 0) lstSyncFolders.Items.Add(item);
+ }
+ }
+ txtSyncFolder.Text = string.Empty;
+ btnAddSyncFolderItem.Enabled = false;
+ btnDeleteSyncFolderItem.Enabled = false;
+
}
public void OnOK()
{
-
string ignoreList = string.Empty;
foreach (string item in lstResyncIgnoreList.Items)
{
@@ -64,6 +78,12 @@
}
m_settings.ResyncIgnoreList = ignoreList;
m_settings.ResyncIgnoreHiddenFiles = cbIgnoreHiddenFiles.Checked;
+ string syncFolderList = string.Empty;
+ foreach (string item in lstSyncFolders.Items)
+ {
+ syncFolderList = syncFolderList + item + ";";
+ }
+ m_settings.SyncFolderList = syncFolderList;
}
public void OnEnter()
@@ -85,6 +105,8 @@
#endregion
+ // Ignore items
+
private void lstResyncIgnoreList_SelectedIndexChanged(object sender, EventArgs e)
{
btnDeleteResyncIgnoreItem.Enabled = lstResyncIgnoreList.SelectedIndex != -1;
@@ -107,5 +129,29 @@
lstResyncIgnoreList.SelectedIndex = -1;
}
+ // Sync folders
+
+ private void lstSyncFolders_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ btnDeleteSyncFolderItem.Enabled = lstSyncFolders.SelectedIndex != -1;
+ }
+
+ private void btnAddSyncFolderItem_Click(object sender, EventArgs e)
+ {
+ lstSyncFolders.Items.Add(txtSyncFolder.Text);
+ txtSyncFolder.Text = string.Empty;
+ }
+
+ private void txtSyncFolder_TextChanged(object sender, EventArgs e)
+ {
+ btnAddSyncFolderItem.Enabled = txtSyncFolder.Text.Length > 0;
+ }
+
+ private void btnDeleteSyncFolderItem_Click(object sender, EventArgs e)
+ {
+ lstSyncFolders.Items.Remove(lstSyncFolders.SelectedItem);
+ lstSyncFolders.SelectedIndex = -1;
+ }
+
}
}
1.2 +31 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/SolutionExplorerOptionsPage.resx
Index: SolutionExplorerOptionsPage.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/SolutionExplorerOptionsPage.resx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- SolutionExplorerOptionsPage.resx 12 Jul 2006 09:15:10 -0000 1.1
+++ SolutionExplorerOptionsPage.resx 28 Sep 2006 20:28:40 -0000 1.2
@@ -149,4 +149,35 @@
0TVAwSFBB3etL9lYWMKmfWXk7ildoC37zfwBYOvcL3dylzIAAAAASUVORK5CYII=
</value>
</data>
+ <data name="btnDeleteSyncFolderItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA
+ CxMBAJqcGAAAAjVJREFUOE9j/P//P4O3l5fBP0aGHob/DG1MjAwHtm7d9o+BWODo6MLs7OKaDqT/Ozk7
+ f/P28g709vFmBhmMjq1sHViCAgOU3N3d8mByDECNLECcZGfvtM3c0va/vYPLHw8Pzypfb1RDVDQNOazt
+ nZyArv3u4OA0B24AiAE0QBKILRwcXbZZ2dj/t7N3+O/v673R19eHGyRvamHL6e7pucLW3um3qal5t5ae
+ CQ+KATAO0BA2IC6wd3D+bWfn9N/H13eZpZW9npWV3WRbG5v/eoYmk9W0DPiRvYbhT2tbW0Z7eydNoJfO
+ m5lb/zcyNvtuaGz0Xk1Ld52yui4nerhgGABToG9g4qCnb/LT0sr2v56+0T0FZU0hbAGL1QBjExMFNXWd
+ S7p6hv+ABv03MbX4r6Wte4soAwyNTOXVNLSvAg34o6GpvUZETNJETl5lm4Gh8X9Vde1MvF7Q0NaVkFVQ
+ PiWnqPofaPshSQkpIR4+Pm5+IRFueSW16QYGxl9UtQxksQaihoEFh5yi2iIJacWPOrqGT7R19bVgCnkE
+ BDg4Obn5dPUNz0rKKEySUVSDJzR4GEjJKniLSSj8V1XT/q+iptHKyc0LTgMwzMLCzAQUV1FRUb3PKyAo
+ r65rwgSSAysQEBBiExERaxUSFv8vr6C8i4OLR42HTwCsABkLCAgym5lZTubm5TJV1zNHGABSJCOvasTK
+ xj6RgZHJjpmFhRdbiINtZGBgYWJi4sKaEnFpwieOMyERaxgAd/H0VrlTD2AAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="btnAddSyncFolderItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALEwAA
+ CxMBAJqcGAAAAfBJREFUOE+Nkl1IU2Ecxo/3fZhBVyEF3dRNFkgZWkGlfUCf2AcVyExaZhAFeZF1YQjG
+ lKKCTOrCEbVSUQhWWbNlMkoG2uykKX7UbGduQyym29k589fOZBEIe/vDc/N/eX7Py/O+GYBkzPdOE6oe
+ lSKzE1JsZkLKPTmakTwQjQEwNOQwEVd70cPNuGzrE6v5vUjSaMcxRrrM9Dp3EY860ULV2JvWcrt6BfVX
+ soQgSbafIK550NUetNlW9N/XCI8fJyAXUnVupRjQ15aHPv0YNWhBna5BC5r4NbiDr505FBdligGuxuXY
+ G7JpvZNNRClj6ksBZw8vZeuGxRzIXyIGpEpqrF1NaGA3/a9WsW7NIqEx5fvbcu3FTC6cyuL03mUc3Tlf
+ Xn1LEMvzQFI3bQEqH/o5f0+hpM7H9koveZd+RNI+kwGwfoBH7+ZoeKNjaY9xo1ml6kkU8/0ZNld4xIA6
+ I/1ZgOvWSUpv+Siu+UnR1UT6ZS85Z9zpAU/tbvQ5fYEiMY0xf4T8g+Xpf1oK4OwZxpABe909mNA35BGF
+ bUcq/g/w7y2M9Kmwhlv2igFN7a5kqpHu+DiEYW57209Lh4fuvjEx4IHNkQRMBkOM+wJ4hv18khXef1Z4
+ 0TVAwSFBB3etL9lYWMKmfWXk7ildoC37zfwBYOvcL3dylzIAAAAASUVORK5CYII=
+</value>
+ </data>
</root>
\ No newline at end of file
1.7 +198 -226 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Lib/AndroMDA.NHibernateSupport.dll
<<Binary file>>
1.2 +22 -0 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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- andromda-m2.xml 25 Jul 2006 13:09:34 -0000 1.1
+++ andromda-m2.xml 28 Sep 2006 20:28:40 -0000 1.2
@@ -155,5 +155,27 @@
</properties>
</namespace>
+
+ <namespace name="aspdotnet">
+ <properties>
+ <property name="web">${web.dir}</property>
+ <property name="web_generated">${web.generated.dir}</property>
+ <property name="web_manual">${web.manual.dir}</property>
+ <property name="webAssemblyName">${web.dir}</property>
+ <property name="AssemblyTitle">${web.dir}</property>
+ <property name="AssemblyDescription"></property>
+ <property name="AssemblyConfiguration"></property>
+ <property name="AssemblyCompany"></property>
+ <property name="AssemblyProduct"></property>
+ <property name="AssemblyCopyright"></property>
+ <property name="AssemblyTrademark"></property>
+ <property name="AssemblyCulture"></property>
+ <property name="AssemblyVersion">1.0.*</property>
+ <property name="AssemblyDelaySign">true</property>
+ <property name="AssemblyKeyFile"></property>
+ <property name="AssemblyKeyName"></property>
+ </properties>
+ </namespace>
+
</namespaces>
</andromda>
\ No newline at end of file
1.3 +17 -2 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- pom.xml 30 Jul 2006 05:33:26 -0000 1.2
+++ pom.xml 28 Sep 2006 20:28:40 -0000 1.3
@@ -28,8 +28,8 @@
<common.assembly.name>${wizard.projects.common.name}</common.assembly.name>
<web.dir>${pom.basedir}/../${wizard.projects.web.dir}</web.dir>
- <web.generated.dir>${pom.basedir}/../${wizard.projects.web.dir}/App_Code/target</web.generated.dir>
- <web.manual.dir>${pom.basedir}/../${wizard.projects.web.dir}/App_Code/src</web.manual.dir>
+ <web.generated.dir>${pom.basedir}/../${wizard.projects.web.dir}/target/src</web.generated.dir>
+ <web.manual.dir>${pom.basedir}/../${wizard.projects.web.dir}/src/main</web.manual.dir>
<schemaexport.dir>${pom.basedir}/../${wizard.projects.schemaexport.dir}</schemaexport.dir>
<schemaexport.available>${wizard.projects.schemaexport.create}</schemaexport.available>
@@ -66,6 +66,9 @@
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-cs-cartridge</artifactId>
</dependency>
+
+${wizard.cartridges.aspnet.mdapom.dependencies}
+
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-validation-library</artifactId>
@@ -106,6 +109,18 @@
<include>**/*</include>
</includes>
</fileset>
+ <fileset>
+ <directory>${web.generated.dir}</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>${web.dir}/App_Code</directory>
+ <includes>
+ <include>target</include>
+ </includes>
+ </fileset>
</filesets>
</configuration>
</plugin>
1.6 +2 -0 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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- pom.xml 22 Aug 2006 02:14:00 -0000 1.5
+++ pom.xml 28 Sep 2006 20:28:40 -0000 1.6
@@ -54,6 +54,8 @@
<version>1.0-SNAPSHOT</version>
</dependency>
+${wizard.cartridges.aspnet.rootpom.dependencies}
+
</dependencies>
</dependencyManagement>
<build>
1.9 +6 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/VSSolutionUtils.cs
Index: VSSolutionUtils.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/VSSolutionUtils.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- VSSolutionUtils.cs 25 Jul 2006 13:09:32 -0000 1.8
+++ VSSolutionUtils.cs 28 Sep 2006 20:28:40 -0000 1.9
@@ -17,6 +17,12 @@
{
public class VSSolutionUtils
{
+ public static string ProjectKindSolutionFolder = "{66A26720-8FB5-11D2-AA7E-00C04F688DDE}";
+ public static string ProjectKindVisualBasic = "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}";
+ public static string ProjectKindVisualCS = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}";
+ public static string ProjectKindVisualCPP = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}";
+ public static string ProjectKindVisualJS = "{E6FDF86B-F3D1-11D4-8576-0002A516ECE8}";
+ public static string ProjectKindWeb = "{E24C65DC-7377-472b-9ABA-BC803B73C61A}";
public static string GetSolutionName(Solution currentSolution)
{
1.4 +15 -6 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- MDASolutionWizard.cs 30 Jul 2006 05:33:26 -0000 1.3
+++ MDASolutionWizard.cs 28 Sep 2006 20:28:41 -0000 1.4
@@ -119,8 +119,10 @@
cbUseNHibernateConfig.Enabled = cbConfigureWebProject.Checked;
//rbWebConfig.Enabled = cbConfigureWebProject.Checked;
cbAddMembershipSupport.Enabled = cbConfigureWebProject.Checked;
+ cbConfigureASPNETCartridge.Enabled = cbConfigureWebProject.Checked;
lblAddMembershipSupportText.Enabled = cbConfigureWebProject.Checked;
lblStoreSettingsInNHibernateConfigDescription.Enabled = cbConfigureWebProject.Checked;
+ lblASPNETCartridge.Enabled = cbConfigureWebProject.Checked;
}
private void cbEnableWebCommonProject_CheckedChanged(object sender, EventArgs e)
@@ -478,6 +480,7 @@
config["projects.web.create"] = BoolToString(usrWebProject.CreateNewProject);
config["projects.web.usenhibernateconfig"] = BoolToString(cbUseNHibernateConfig.Checked);
config["projects.web.addmembership"] = BoolToString(cbAddMembershipSupport.Checked);
+ config["cartridges.aspnet.configure"] = BoolToString(cbConfigureASPNETCartridge.Checked);
config["projects.web.common.configure"] = BoolToString(cbConfigureWebCommonProject.Checked);
config["projects.web.common.name"] = usrWebCommonProject.ProjectName;
@@ -503,11 +506,11 @@
config["database.nhibernatedialect"] = "NHibernate.Dialect.MySQLDialect";
config["hibernate.connection.driver_class"] = "NHibernate.Driver.MySqlDataDriver";
break;
- case "Hypersonic":
- config["database.mappingtype"] = "HypersonicSql";
- config["database.hibernatedialect"] = "net.sf.hibernate.dialect.HSQLDialect";
- config["database.nhibernatedialect"] = "NHibernate.Dialect.GenericDialect";
- config["hibernate.connection.driver_class"] = "NHibernate.Driver.OdbcDriver";
+ case "PostgreSQL":
+ config["database.mappingtype"] = "PostgreSQL";
+ config["database.hibernatedialect"] = "net.sf.hibernate.dialect.PostgreSQLDialect";
+ config["database.nhibernatedialect"] = "NHibernate.Dialect.PostgreSQLDialect";
+ config["hibernate.connection.driver_class"] = "NHibernate.Driver.NpgsqlDriver";
break;
case "Oracle 9i":
config["database.mappingtype"] = "Oracle9i";
@@ -515,6 +518,12 @@
config["database.nhibernatedialect"] = "NHibernate.Dialect.Oracle9Dialect";
config["hibernate.connection.driver_class"] = "NHibernate.Driver.OracleClientDriver";
break;
+ case "Hypersonic":
+ config["database.mappingtype"] = "HypersonicSql";
+ config["database.hibernatedialect"] = "net.sf.hibernate.dialect.HSQLDialect";
+ config["database.nhibernatedialect"] = "NHibernate.Dialect.GenericDialect";
+ config["hibernate.connection.driver_class"] = "NHibernate.Driver.OdbcDriver";
+ break;
}
return config;
1.4 +454 -426 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- MDASolutionWizard.designer.cs 27 Jul 2006 03:55:48 ...
[truncated message content] |
|
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] |
|
From: Chris M. <cm...@us...> - 2007-08-03 14:46:01
|
User: cmicali
Date: 07/08/03 07:46:03
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS
Setup.nsi
Log:
- Added SQLServer2005 dialect to solution wizard
- Added Lorna Burnet's patches
Revision Changes Path
No revision
No revision
No revision
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X