From: Chris M. <cm...@us...> - 2006-07-31 21:05:21
|
User: cmicali Date: 06/07/31 14:05:19 Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn VS80AddIn.cs etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven Maven1Proxy.cs Maven2Proxy.cs MavenProxy.cs etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages AboutOptionsPage.designer.cs AboutOptionsPage.resx etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/SchemaExport App.config etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils AsyncOperation.cs VSExternalToolProxy.cs etc/andromda-dotnet/AndroMDA.VS80AddIn Android VS Readme.rtf etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS Setup.nsi Removed: etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroidVS-1.4-beta4-Setup.exe Log: - Updated version numbers to 1.5 Few bug fixes for 1.4 release - Performance increase to maven 2 proxy - Added 2 required keys to schema export app config Revision Changes Path 1.14 +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.13 retrieving revision 1.14 diff -u -w -r1.13 -r1.14 --- VS80AddIn.cs 25 Jul 2006 13:09:28 -0000 1.13 +++ VS80AddIn.cs 31 Jul 2006 21:05:18 -0000 1.14 @@ -20,7 +20,7 @@ public class VS80AddIn { - public const string ADD_IN_VERSION = "1.4"; + public const string ADD_IN_VERSION = "1.5"; #region Constants 1.2 +2 -2 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.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- Maven1Proxy.cs 25 Jul 2006 13:09:33 -0000 1.1 +++ Maven1Proxy.cs 31 Jul 2006 21:05:18 -0000 1.2 @@ -68,11 +68,11 @@ } } - public override void BeforeStart() + protected override void BeforeExecution() { m_mavenOptions = "mda"; - base.BeforeStart(); + base.BeforeExecution(); this.OutputWindowPane.OutputString("Launching 'maven " + m_mavenOptions + "'...\n\n"); 1.3 +20 -6 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven/Maven2Proxy.cs Index: Maven2Proxy.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven/Maven2Proxy.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- Maven2Proxy.cs 30 Jul 2006 05:33:25 -0000 1.2 +++ Maven2Proxy.cs 31 Jul 2006 21:05:18 -0000 1.3 @@ -39,10 +39,6 @@ private void ProcessOutput(ref string text, ref bool cancelOutput) { if (text == string.Empty) return; - if (text.Contains("does not exist or no valid version could be found") || text.Contains("required artifacts are missing") || text.Contains("required artifact is missing") || text.Contains("Failed to resolve artifact")) - { - m_mavenStatus = MavenStatus.UnsatisfiedDependency; - } else { if (text.EndsWith("K")) @@ -63,11 +59,11 @@ } } - public override void BeforeStart() + protected override void BeforeExecution() { m_mavenOptions = "install"; - base.BeforeStart(); + base.BeforeExecution(); this.OutputWindowPane.OutputString("Launching 'mvn " + m_mavenOptions + "'...\n\n"); @@ -105,6 +101,24 @@ } + protected override void AfterExecution() + { + VSExternalToolEventArgs args = (VSExternalToolEventArgs)this.EventArguments; + foreach (string line in OutputLines) + { + if (line.Contains("does not exist or no valid version could be found") || + line.Contains("required artifacts are missing") || + line.Contains("required artifact is missing") || + line.Contains("Failed to resolve artifact")) + { + m_mavenStatus = MavenStatus.UnsatisfiedDependency; + } + if (args.ExitStatus != ToolExitStatus.Error && line.Contains("[ERROR]")) + { + args.ExitStatus = ToolExitStatus.Error; + } + } + } } } \ No newline at end of file 1.2 +2 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven/MavenProxy.cs Index: MavenProxy.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven/MavenProxy.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- MavenProxy.cs 25 Jul 2006 13:09:33 -0000 1.1 +++ MavenProxy.cs 31 Jul 2006 21:05:18 -0000 1.2 @@ -92,7 +92,7 @@ } - public override void BeforeStart() + protected override void BeforeExecution() { ApplicationObject.StatusBar.Text = "AndroMDA: Generation started..."; @@ -122,7 +122,7 @@ m_forceOnlineMode = false; } - base.BeforeStart(); + base.BeforeExecution(); } protected override void DoWork() 1.4 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.designer.cs Index: AboutOptionsPage.designer.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.designer.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- AboutOptionsPage.designer.cs 30 Jul 2006 05:33:25 -0000 1.3 +++ AboutOptionsPage.designer.cs 31 Jul 2006 21:05:18 -0000 1.4 @@ -69,7 +69,7 @@ this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(260, 13); this.label1.TabIndex = 0; - this.label1.Text = "AndroMDA integration for Visual Studio 2005"; + this.label1.Text = "Visual Studio 2005 integration for AndroMDA"; // // pictureBox1 // 1.4 +65 -65 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.resx Index: AboutOptionsPage.resx =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.resx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- AboutOptionsPage.resx 30 Jul 2006 05:33:25 -0000 1.3 +++ AboutOptionsPage.resx 31 Jul 2006 21:05:18 -0000 1.4 @@ -380,82 +380,82 @@ <value> AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB4 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0 EQAAAk1TRnQBSQFMAgEBAwEAAQQBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA - AwABEAMAAQEBAAEgBgABEBoAAYECIQH/AX4CIQH/AX4CIQH/AX4CIQH/AX4CIQH/AX4CIQH/AX4CIQH/ - AX4CIQH/AX4CIQH/AX4CIQH/AX4CIQH/AX8CIQH/AbcCIQH/EAABBwIBAQcBHgIBASgBPgIBAWcBTwIC + AwABEAMAAQEBAAEgBgABEBoAAYECIgH/AX8CIgH/AX8CIgH/AX8CIgH/AX8CIgH/AX8CIgH/AX8CIgH/ + AX8CIgH/AX8CIgH/AX8CIgH/AX8CIgH/AYACIgH/AbcCIgH/EAABBwIBAQcBHgIBASgBPgIBAWcBTwIC AZkBVgICAa0BVQICAa4BUgICAaIBRAIBAXcBJwIBATgBDAIBAQ4BAgMBDAABBwIBAQgBTwICAZkBZAIF AeQBWwICAb0BSwICAYwBPAIBAWQBJQIBATUBHAIBASYBRQIBAXsBVgICAa8BUgICAaUBQwIBAXMBGgIB ASIBAgMBTAAB7AHaAdMC/wHoAdYC/wHmAdIC/wHlAc4C/wHiAcoC/wHhAcYC/wHgAcMC/wHdAb8C/wHc - AbsC/wHaAbgC/wHZAbMB/wGLAXcBcwH/AbMCIQH/DAABCgIBAQwBMwIBAU8BmQFnAWMB/AH0AegB4wH/ + AbsC/wHaAbgC/wHZAbMB/wGLAXgBdAH/AbMCIgH/DAABCgIBAQwBMwIBAU8BlwFlAWEB/AH0AegB4wH/ AvQB8wH/AfAB8gHzAf8B8QHyAfMB/wH0Ae0B6QH/Ae4B2wHQAf8BYgIDAdQBQQIBAXABFAIBARkBAgMB CAABXgIDAcUD1AP/AfkD/wH7Av8B+wH2Af8BywG3AaMB/wF0AgoB8wG2Aj8B/QH/AsYC/wLaAv8C6QH/ AcgCqQH/AVcCAgG2ASkCAQE8AQIDAUgAAeIB2QHSAv8B6gHVAv8B6AHPAv8B5QHKAv8B4gHEAv8B3gG/ - Av8B3QG6Av8B2gG1Av8B2AGxAv8B1gGrAv8B1AGjAf8BiQF1AXkB/wGzAiEB/wgAAQkCAQEKAUUCAQF5 - AfUB6wHlAf8B8AHxAfIB/wHkAd0B2wH/Ab4BiwGBAf8BwgGBAXMB/wHMAY8BgQH/Ad8BzgHEAf8B7QHw - AfIB/wH2AvQB/wF/AScBJgH4AUYCAQF9ARICAQEWAQIDAQQAA7cB/wHBAsIC/wH2Ae4B/wFaAawBUwH/ + Av8B3QG6Av8B2gG1Av8B2AGxAv8B1gGrAv8B1AGjAf8BiQF2AXoB/wGzAiIB/wgAAQkCAQEKAUUCAQF5 + AfUB6wHlAf8B8AHxAfIB/wHkAd0B2wH/Ab4BiwGBAf8BwgGBAXQB/wHMAY8BgQH/Ad8BzgHEAf8B7QHw + AfIB/wH2AvQB/wF/ASYBJQH4AUYCAQF9ARICAQEWAQIDAQQAA7cB/wHBAsIC/wH2Ae4B/wFbAawBVAH/ AbAB2QGlAf8B7wHGAY0B/wHHAoEC/wKhAv8CsgL/AsQC/wLUAv8C/gH/AfEC6gH/AVcCAgGxARgCAQEf SAAB5AHdAdYC/wHtAdsC/wHqAdYC/wHoAdEC/wHqAccB/wHBAboB0gL/AecBvgL/Ad4BuwL/AdsBtgL/ - AdgBsQL/AdcBqQH/AYsBdwF6Af8BswIhAf8IAAEwAgEBSgH3AfEB7QH/AfAB9AH1Af8ByAGBAX4B/wG/ - AXwBSwH/AcIBgQFZAf8B7AHuAe8B/wHSAYgBgQH/AcABfwFOAf8BvQGBAVMB/wHqAekB6AH/AfUB9gH3 - Af8BdgIJAfEBOwIBAWABCAIBAQkEAAO/Af8C2QHaAv8B7gHfAf8BKAGwATkB/wExAa0BPAH/AV8BgQFK - Av8CtQL/Ap4C/wKgAv8BsQGwAv8BxQHDCf8BoAJ/Af4BQAIBAW1IAAHmAeAB2wL/AfMB5gL/AfMB5gL/ - Ae4BvgH/AUUBYQHvAf8BIQFUAv8CgQHgAv8B3gG9Av8B3gG9Av8B3gG9Av8B3gG9Af8BjgF6AXsB/wGz - AiEB/wgAAfEB3gHTAf8B9AL2Af8BxAGBAWQB/wHFAYEBUwH/AcsBgQFUAf8BwAGBAWgB/wH+A/8B2QGo - AY8B/wHKAYEBVAH/AccBgQFSAf8BvAF5AUcB/wHuAe8B8AH/AfYB7gHqAf8BWAICAboBHAIBASUEAAPL - Af8B2wLcAv8B5gHOAf8BRQHMAWUB/wE+Ab4BUgH/AaYBiAGBAv8CwwL/ArAC/wHRAdkB/wH4AbEBzAL/ - AecG/wH9AfwB/QH/AfwC+wH/AVMCAgGkSAAB6QHjAd8C/wHmAckB/wGQAY8ByQH/ASEBSQL/ASEBSgL/ - ATIBYQL/ASEBSwL/AfkB3AGsAv8B3gG9Av8B3gG9Av8B3AG0Af8BjgF7AXwB/wGzAiEB/wQAATECAQFL - AfkB+gH5Af8B4QHBAbEB/wHGAYEBUwH/AcwBgQFWAf8BzAGBAVUB/wHMAYEBUwH/AcoBgQFMAf8BywGB - AVAB/wHMAYEBVAH/AcsBgQFVAf8BxwGBAVMB/wHGAYEBbgH/AfMC9QH/AZQBYgFfAfwBNAIBAVIEAAPP - Af8B3wHgAeIC/wHdAbwB/wFjAeoBgQH/AVAB0wFtAf8BywGcAZ8C/wLNAv8CwwL/AfQB/AH/AaICzAH/ - Aa0BggGBAf8B9wHzAfIB/wHrAeIB3wH/AfAB6QHlAf8BWgIDAcJIAAHrAeYB4wL/AeUByQH/AXYBgQHz - Af8BRQFrAv8B/AHkAbkC/wHpAbIB/wEhAUgC/wE9AWAB8wL/AdwBrAL/AdUBrAL/Ad4BuQH/AY8BfAF+ - Af8BswIhAf8EAAFqAgUB4QH6Af0B/gH/AcYBgQFXAf8BzQGBAVcB/wHNAYEBVgH/AcwBgQFUAf8BxwGB - AVgF/wHaAZEBgQH/AcwBgQFUAf8BzAGBAVUB/wHLAYEBVQH/AcEBfQFJAf8D8QH/AfIB3wHVAf8BRAIB - AXcEAAPSAf8B4wHmAegC/wHXAaoB/wFeAcIB4AH/AWoBswL/AZ0BgQGOAv8CygL/AtYC/wH1Av8BywGh + AdgBsQL/AdcBqQH/AYsBeAF7Af8BswIiAf8IAAEwAgEBSgH3AfEB7QH/AfAB9AH1Af8ByAGBAX8B/wG/ + AX0BTAH/AcIBgQFaAf8B7AHuAe8B/wHSAYgBgQH/AcABgAFPAf8BvQGBAVQB/wHqAekB6AH/AfUB9gH3 + Af8BdgIJAfEBOwIBAWABCAIBAQkEAAO/Af8C2QHaAv8B7gHfAf8BKQGwAToB/wEyAa0BPQH/AWABgQFL + Av8CtQL/Ap4C/wKgAv8BsQGwAv8BxQHDCf8BnwJ/Af4BQAIBAW1IAAHmAeAB2wL/AfMB5gL/AfMB5gL/ + Ae4BvgH/AUYBYgHvAf8BIgFVAv8CgQHgAv8B3gG9Av8B3gG9Av8B3gG9Av8B3gG9Af8BjgF7AXwB/wGz + AiIB/wgAAfEB3gHTAf8B9AL2Af8BxAGBAWUB/wHFAYEBVAH/AcsBgQFVAf8BwAGBAWkB/wH+A/8B2QGo + AY8B/wHKAYEBVQH/AccBgQFTAf8BvAF6AUgB/wHuAe8B8AH/AfYB7gHqAf8BWAICAboBHAIBASUEAAPL + Af8B2wLcAv8B5gHOAf8BRgHMAWYB/wE/Ab4BUwH/AaYBiAGBAv8CwwL/ArAC/wHRAdkB/wH4AbEBzAL/ + AecG/wH9AfwB/QH/AfwC+wH/AVMCAgGkSAAB6QHjAd8C/wHmAckB/wGQAY8ByQH/ASIBSgL/ASIBSwL/ + ATMBYgL/ASIBTAL/AfkB3AGsAv8B3gG9Av8B3gG9Av8B3AG0Af8BjgF8AX0B/wGzAiIB/wQAATECAQFL + AfkB+gH5Af8B4QHBAbEB/wHGAYEBVAH/AcwBgQFXAf8BzAGBAVYB/wHMAYEBVAH/AcoBgQFNAf8BywGB + AVEB/wHMAYEBVQH/AcsBgQFWAf8BxwGBAVQB/wHGAYEBbwH/AfMC9QH/AZIBYAFeAfwBNAIBAVIEAAPP + Af8B3wHgAeIC/wHdAbwB/wFkAeoBgQH/AVEB0wFuAf8BywGcAZ8C/wLNAv8CwwL/AfQB/AH/AaICzAH/ + Aa0BggGBAf8B9wHzAfIB/wHrAeIB3wH/AfAB6QHlAf8BWgIDAcJIAAHrAeYB4wL/AeUByQH/AXcBgQHz + Af8BRgFsAv8B/AHkAbkC/wHpAbIB/wEiAUkC/wE+AWEB8wL/AdwBrAL/AdUBrAL/Ad4BuQH/AY8BfQF/ + Af8BswIiAf8EAAFqAgUB4QH6Af0B/gH/AcYBgQFYAf8BzQGBAVgB/wHNAYEBVwH/AcwBgQFVAf8BxwGB + AVkF/wHaAZEBgQH/AcwBgQFVAf8BzAGBAVYB/wHLAYEBVgH/AcEBfgFKAf8D8QH/AfIB3wHVAf8BRAIB + AXcEAAPSAf8B4wHmAegC/wHXAaoB/wFfAcIB4AH/AWsBswL/AZ0BgQGOAv8CygL/AtYC/wH1Av8BywGh AZ4B/wHdAZQBmAL/AcUBxgL/ArIC/wLKAf8BWwICAb1IAAHtAeoB5wL/AecBzgL/AeQBwgL/AeMBvgL/ - Ad4BvQL/AdwBugH/AqUB2QH/ASEBUQL/AcYBswG8Av8B1wGvAv8B4QG+Af8BkwF+AYAB/wGzAiEB/wQA - AbcBkQGKAv4D/wHKAYEBUwH/AdABgQFZAf8BzAGBAVQB/wHMAYEBVAH/AcwBgQFQAf8B5AHqAewB/wH6 - AfEB7AH/AcoBgQFNAf8BzAGBAVQB/wHNAYEBVgH/AcgBgQFTAf8B6wHbAdMB/wH1AekB4wH/AUgCAgGC - BAAB1wHTAcsB/wHyAbgBgQL/Ac8BnAH/AbABuwHFAf8BgQG2AeMB/wFiAXMBow7/AcsB6AL/AckB2AL/ + Ad4BvQL/AdwBugH/AqUB2QH/ASIBUgL/AcYBswG8Av8B1wGvAv8B4QG+Af8BkwF/AYEB/wGzAiIB/wQA + AbYBjwGIAv4D/wHKAYEBVAH/AdABgQFaAf8BzAGBAVUB/wHMAYEBVQH/AcwBgQFRAf8B5AHqAewB/wH6 + AfEB7AH/AcoBgQFOAf8BzAGBAVUB/wHNAYEBVwH/AcgBgQFUAf8B6wHbAdMB/wH1AekB4wH/AUgCAgGC + BAAB1wHTAcsB/wHyAbgBgQL/Ac8BnAH/AbABuwHFAf8BgQG2AeMB/wFjAXQBow7/AcsB6AL/AckB2AL/ ApwC/wKgAf8B/QKyAf8BQwIBAXVIAAHvAe0B6wL/AegB0QL/AeEBwwL/AeABwAL/Ad8BvgL/Ad0BuwL/ - AeUBtQH/ASwBVgL/ASEBSAP/Ad4BvQL/AeQBxAH/AZQBgAGBAf8BswIhAf8EAAHwAdwB0QX/AdIBgQFa - Af8B0wGBAVwB/wHMAYEBVAH/AcwBgQFUAf8BzAGBAVQB/wHFAYEBWgH/AfYB+QH7Af8B+wHxAe0B/wHL - AYEBTgH/Ac8BgQFYAf8BzAGBAVcB/wHuAdsB0gH/AfcB7AHlAf8BRgIBAXwEAAHbAcEBnQH/AeIBqAGA - Av8BxwGKAv8ByQGPAv8ByQGOAv8ByQGQAf8BvgGgAaQG/wL+Av8CzwL/AsMC/wKxAv8CngH/AbkCPwH9 - ARUCAQEbSAAB8gLxAv8B5wHRAv8B4AHAAv8B3wG/Av8B3QG8Av8B3AG6Av8B2wG4Af8B7QHWAb8B/wEh - AU4C/wKBAdsC/wHmAckB/wGYAoEB/wGzAiEB/wQAAXICGQH1BP8B3wGBAWcB/wHbAYEBZQH/Ac4BgQFW - Af8BywGBAU0B/wHLAYEBUQH/AcwBgQFUAf8BxAGBAW0F/wHcAZQBgQH/AdIBgQFcAf8BzwGBAVcB/wH7 - AfUB8wH/AfUB5AHcAf8BOgIBAV8EAAHbAccBsgH/A9kC/wG6AYEC/wG7AYEC/wG8AYEC/wG9AYEB/wH5 - AboBgQH/AcUBqwGtAv8C9wL/AuEC/wLQAv8CxgH/AdICjwH/AR8CAQEqAQIDAUgAAfQC8wL/AeIBxgL/ - AdcBsQL/AdcBsAL/AdYBrwL/AdYBrQL/AdYBrAL/AdcBqQH/AWcBgQHzAf8B/AHdAaUC/wHpAc8B/wGa - AoEB/wGzAiEB/wQAAUgCAgGABP8B+wHJAa4B/wHuAYoBeAH/AdIBgQFpAf8B8QH2AfkB/wHrAcIBrgH/ - AcsBgQFQAf8BygGBAWQF/wHfAaUBiQH/AdwBgQFmAf8B2AGBAWUF/wG2AY8BiAH+ASMCAQExBAAD0QH/ - AccBygHNAf8B/gGtAVcB/wHzAfEB7wH/AfIB1gGqAf8B9AG/AYEB/wH6Aa4BXwL/AagBQAH/AcgBgQFb - Af8BvgGRAYUB/wGyAk8B/QFbAgIBuAEUAgEBGVAAAvYB9QL/AeEBwgL/AdYBrAL/AdUBqwL/AdUBqwL/ - AdQBqQL/AdQBqQL/AdMBqAL/AdUBpgL/AdEBpAL/Ae0B1gH/AZwBgAGBAf8BswIhAf8IAAH2AegB4Ab/ - AaMBgQH/AfoBlQGBAf8BzQHGAcMF/wH8AfUB8QX/AfYB+wH9Af8B5gGDAXMB/wHrAYMBcAH/Af0B9QHu - Af8B/gL8Af8BTQICAZMBDAIBAQ4EAAPoAf8B6gLrAf8BzQG0AbUB/wHnAtwB/wH1AvcB/wHvAvEB/wHq - AewB7QH/AeEB5AHmAf8B2wHfAeUB/wHWAdgB2gH/AaYBhgF/Af4BawIGAekBFwIBAR1QAAL4AfUK/wH+ - A/8B+wH5Av8B+QH0Av8B9gHvAv8B9AHqAv8B8wHmAf8B+wHwAeMC/wHxAdcB/wGfAXwBfQH/AbACIQH/ - CAABSgICAYYJ/wHQAZwC/wG7AYcB/wHpAb8BqgH/AdcBxwHAAf8B3wHJAb8B/wH8AakBgQL/AaQBgQL/ - AegB1wX/AZkBZwFjAfwBHgIBASgBAwIBAQIBBAIBAQQB3wLeAf8B3QHLAbwB/wG2AoEB/wGrAoEB/wGw - AoEB/wGzAoEB/wG7AYQBhQH/AcoCnwH/AeoC7AH/AekC6gH/AX8CKgH4AScCAQE4VAAB+gH5AfcO/wL+ - Av8B+wH4Av8B+QH0Av8B9gHuAf8B7gHfAdoB/wHxAZgBQwH/Ad4BgQEtAf8BugGJAYEB/wHKAiEB/wgA - AQIDAQFgAgMB0wr/Ae0C/wH7AdEC/wHvAbsC/wHkAbEC/wHrAc0J/wG4AZIBiwH+ASMCAQExAQQCAQEE - BAABPAIBAWQB9QH5Af4B/wH9AcMBgQL/AcwBlwL/Ac0BnwL/Ac8BqQL/AdEBsQH/Af0BygG2Af8B8wHB - AbcC/wLbAv8C5AH/Ae8C6AH/AUYCAQF8AQMCAQEDUAAB/QH6AfgS/wL+Av8B/AH5Av8B+QH0Af8B7wHh - AdwC/wHPAYEB/wG6AYkBgQH/AcoCIQH/EAABAgMBAUYCAQF7AfUB5gHeFf8B+gHxAewB/wFrAgYB6QEY - AgEBHwEDAgEBAwgAAUsCAgGLAf4BtwF8Af8B/gHLAZYC/wHMAZ8C/wHOAagC/wHOAbAC/wHOAbgC/wHN - AcAB/wG6AYcBhAH+AWwCBwHrAf8C/QX/AUwCAgGOAQgCAQEJUAAB9wHSAa8B/wHyAcsBqwH/AeoBxAGn - Af8B4QG7AaIB/wHZAbMBnQH/AdABqgGYAf8BygGkAZQB/wHIAaIBkwH/AcgBogGTAf8BugGJAYEB/wHK - AiEB/yAAAUACAQFtAXECBwHsAbgBkgGKAf4BiQE/AT4B+gFSAgIBniAAAQIDAQECAwEBFAIBARoBKAIB - ATkBNwIBAVgBSgICAYUBTgICAY8BFAIBARoBLQIBAUQBCgIBAQwBAgMBTAABQgFNAT4HAAE+AwABKAMA - AUADAAEQAwABAQEAAQEFAAGAFwAD/wEAAcABAQHgAQMBgAEBAgABwAEBAcABAQGAAwABwAEBAYABAAGA - AwABwAEBAYABAAGAAwABwAEBAYABAAGAAwABwAEBAgABgAMAAcABAQIAAYADAAHAAQECAAGAAwABwAEB - AgABgAMAAcABAQIAAYADAAHAAQECAAGAAQMCAAHAAQEBgAEAAYABAwIAAcABAQGAAgABBwIAAcABAQGA - AQEBAAEDAgABwAEDAcABAwEAAQMCAAHAAQcB+AE/AcABBwIACw== + AeUBtQH/AS0BVwL/ASIBSQP/Ad4BvQL/AeQBxAH/AZQCgQH/AbMCIgH/BAAB8AHcAdEF/wHSAYEBWwH/ + AdMBgQFdAf8BzAGBAVUB/wHMAYEBVQH/AcwBgQFVAf8BxQGBAVsB/wH2AfkB+wH/AfsB8QHtAf8BywGB + AU8B/wHPAYEBWQH/AcwBgQFYAf8B7gHbAdIB/wH3AewB5QH/AUYCAQF8BAAB2wHBAZ0B/wHiAagBgQL/ + AccBigL/AckBjwL/AckBjgL/AckBkAH/Ab4BoAGkBv8C/gL/As8C/wLDAv8CsQL/Ap4B/wG5Aj8B/QEV + AgEBG0gAAfIC8QL/AecB0QL/AeABwAL/Ad8BvwL/Ad0BvAL/AdwBugL/AdsBuAH/Ae0B1gG/Af8BIgFP + Av8CgQHbAv8B5gHJAf8BmAKBAf8BswIiAf8EAAFyAhcB9QT/Ad8BgQFoAf8B2wGBAWYB/wHOAYEBVwH/ + AcsBgQFOAf8BywGBAVIB/wHMAYEBVQH/AcQBgQFuBf8B3AGUAYEB/wHSAYEBXQH/Ac8BgQFYAf8B+wH1 + AfMB/wH1AeQB3AH/AToCAQFfBAAB2wHHAbIB/wPZAv8BugGBAv8BuwGBAv8BvAGBAv8BvQGBAf8B+QG6 + AYEB/wHFAasBrQL/AvcC/wLhAv8C0AL/AsYB/wHSAo8B/wEfAgEBKgECAwFIAAH0AvMC/wHiAcYC/wHX + AbEC/wHXAbAC/wHWAa8C/wHWAa0C/wHWAawC/wHXAakB/wFoAYEB8wH/AfwB3QGlAv8B6QHPAf8BmgKB + Af8BswIiAf8EAAFIAgIBgAT/AfsByQGuAf8B7gGKAXkB/wHSAYEBagH/AfEB9gH5Af8B6wHCAa4B/wHL + AYEBUQH/AcoBgQFlBf8B3wGlAYkB/wHcAYEBZwH/AdgBgQFmBf8BtQGNAYYB/gEjAgEBMQQAA9EB/wHH + AcoBzQH/Af4BrQFYAf8B8wHxAe8B/wHyAdYBqgH/AfQBvwGBAf8B+gGuAWAC/wGoAUEB/wHIAYEBXAH/ + Ab4BkQGFAf8BsgJNAf0BWwICAbgBFAIBARlQAAL2AfUC/wHhAcIC/wHWAawC/wHVAasC/wHVAasC/wHU + AakC/wHUAakC/wHTAagC/wHVAaYC/wHRAaQC/wHtAdYB/wGcAoEB/wGzAiIB/wgAAfYB6AHgBv8BowGB + Af8B+gGVAYEB/wHNAcYBwwX/AfwB9QHxBf8B9gH7Af0B/wHmAYMBdAH/AesBgwFxAf8B/QH1Ae4B/wH+ + AvwB/wFNAgIBkwEMAgEBDgQAA+gB/wHqAusB/wHNAbQBtQH/AecC3AH/AfUC9wH/Ae8C8QH/AeoB7AHt + Af8B4QHkAeYB/wHbAd8B5QH/AdYB2AHaAf8BpQGEAX8B/gFrAgYB6QEXAgEBHVAAAvgB9Qr/Af4D/wH7 + AfkC/wH5AfQC/wH2Ae8C/wH0AeoC/wHzAeYB/wH7AfAB4wL/AfEB1wH/AZ8BfQF+Af8BsAIiAf8IAAFK + AgIBhgn/AdABnAL/AbsBhwH/AekBvwGqAf8B1wHHAcAB/wHfAckBvwH/AfwBqQGBAv8BpAGBAv8B6AHX + Bf8BlwFlAWEB/AEeAgEBKAEDAgEBAgEEAgEBBAHfAt4B/wHdAcsBvAH/AbYCgQH/AasCgQH/AbACgQH/ + AbMCgQH/AbsBhAGFAf8BygKfAf8B6gLsAf8B6QLqAf8BfwIpAfgBJwIBAThUAAH6AfkB9w7/Av4C/wH7 + AfgC/wH5AfQC/wH2Ae4B/wHuAd8B2gH/AfEBmAFEAf8B3gGBAS4B/wG6AYkBgQH/AcoCIgH/CAABAgMB + AWACAwHTCv8B7QL/AfsB0QL/Ae8BuwL/AeQBsQL/AesBzQn/AbcBkAGJAf4BIwIBATEBBAIBAQQEAAE8 + AgEBZAH1AfkB/gH/Af0BwwGBAv8BzAGXAv8BzQGfAv8BzwGpAv8B0QGxAf8B/QHKAbYB/wHzAcEBtwL/ + AtsC/wLkAf8B7wLoAf8BRgIBAXwBAwIBAQNQAAH9AfoB+BL/Av4C/wH8AfkC/wH5AfQB/wHvAeEB3AL/ + Ac8BgQH/AboBiQGBAf8BygIiAf8QAAECAwEBRgIBAXsB9QHmAd4V/wH6AfEB7AH/AWsCBgHpARgCAQEf + AQMCAQEDCAABSwICAYsB/gG3AX0B/wH+AcsBlgL/AcwBnwL/Ac4BqAL/Ac4BsAL/Ac4BuAL/Ac0BwAH/ + AbkBhQGCAf4BbAIHAesB/wL9Bf8BTAICAY4BCAIBAQlQAAH3AdIBrwH/AfIBywGrAf8B6gHEAacB/wHh + AbsBogH/AdkBswGdAf8B0AGqAZgB/wHKAaQBlAH/AcgBogGTAf8ByAGiAZMB/wG6AYkBgQH/AcoCIgH/ + IAABQAIBAW0BcQIHAewBtwGQAYgB/gGHAT4BPQH6AVICAgGeIAABAgMBAQIDAQEUAgEBGgEoAgEBOQE3 + AgEBWAFKAgIBhQFOAgIBjwEUAgEBGgEtAgEBRAEKAgEBDAECAwFMAAFCAU0BPgcAAT4DAAEoAwABQAMA + ARADAAEBAQABAQUAAYAXAAP/AQABwAEBAeABAwGAAQECAAHAAQEBwAEBAYADAAHAAQEBgAEAAYADAAHA + AQEBgAEAAYADAAHAAQEBgAEAAYADAAHAAQECAAGAAwABwAEBAgABgAMAAcABAQIAAYADAAHAAQECAAGA + AwABwAEBAgABgAMAAcABAQIAAYABAwIAAcABAQGAAQABgAEDAgABwAEBAYACAAEHAgABwAEBAYABAQEA + AQMCAAHAAQMBwAEDAQABAwIAAcABBwH4AT8BwAEHAgAL </value> </data> </root> \ No newline at end of file 1.2 +29 -27 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/SchemaExport/App.config Index: App.config =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/SchemaExport/App.config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- App.config 18 Apr 2006 16:14:45 -0000 1.1 +++ App.config 31 Jul 2006 21:05:18 -0000 1.2 @@ -30,6 +30,8 @@ <appSettings> <add key="nhibernate.config" value="nhibernate.config" /> + <add key="schema.create.file" value="schema-create.sql"/> + <add key="schema.drop.file" value="schema-drop.sql"/> </appSettings> </configuration> \ No newline at end of file 1.5 +7 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/AsyncOperation.cs Index: AsyncOperation.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/AsyncOperation.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- AsyncOperation.cs 25 Jul 2006 13:09:32 -0000 1.4 +++ AsyncOperation.cs 31 Jul 2006 21:05:18 -0000 1.5 @@ -59,7 +59,11 @@ eventArguments = EventArgs.Empty; } - public virtual void BeforeStart() + protected virtual void BeforeExecution() + { + } + + protected virtual void AfterExecution() { } @@ -82,7 +86,6 @@ isRunning = true; try { - BeforeStart(); ThreadStart ts = new ThreadStart(InternalStart); workerThread = new Thread(ts); } @@ -332,7 +335,9 @@ // isRunning is set during Start to avoid a race condition try { + BeforeExecution(); DoWork(); + AfterExecution(); } catch (ThreadAbortException) { 1.6 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/VSExternalToolProxy.cs Index: VSExternalToolProxy.cs =================================================================== RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/VSExternalToolProxy.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -w -r1.5 -r1.6 --- VSExternalToolProxy.cs 25 Jul 2006 13:09:32 -0000 1.5 +++ VSExternalToolProxy.cs 31 Jul 2006 21:05:18 -0000 1.6 @@ -135,7 +135,7 @@ return false; } - public override void BeforeStart() + protected override void BeforeExecution() { m_psi = new System.Diagnostics.ProcessStartInfo(); foreach (string key in m_environmentVariables.Keys) No revision No revision No revision No revision No revision No revision |