Menu
▾
▴
[Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS Setup.nsi
|
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] |
