[Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

  User: cmicali 
  Date: 06/07/25 06:09:35

  Modified:    etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
                        AddInSettings.cs AndroMDA.VS80AddIn.AddIn
                        AndroMDA.VS80AddIn.csproj AssemblyInfo.cs
                        Connect.cs ConversionCodeGenerator.cs MDAProject.cs
                        MDASolutionManager.cs Resource1.Designer.cs
                        Resource1.resx VS80AddIn.cs
                        WizardSolutionProcessor.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
                        AboutCommand.cs AddInCommandBase.cs
                        AndroMDALogoCommand.cs
                        CreateEntityVOConvertorCommand.cs
                        GenerateCodeCommand.cs OpenModelCommand.cs
                        PropertyMapperCommand.cs ReloadMDAConfigCommand.cs
                        ResyncCommand.cs RunSchemaExportCommand.cs
                        RunSolutionWizardCommand.cs StopCommand.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Controls
                        MDAProjectSetupControl.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
                        AboutDialog.cs AboutDialog.designer.cs
                        PropertyMapperDialog.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages
                        AboutOptionsPage.cs AboutOptionsPage.designer.cs
                        AboutOptionsPage.resx ExternalToolsOptionsPage.cs
                        GeneralOptionsPage.cs MDAOptionPageProperties.cs
                        SolutionExplorerOptionsPage.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Lib
                        AndroMDA.NHibernateSupport.dll
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership
                        DomainMembershipProvider.cs DomainRoleProvider.cs
                        MembershipServiceImpl.cs UserDaoImpl.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/SchemaExport
                        Program.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda
                        cvsignore project.properties
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
                        AddInUtils.cs AsyncOperation.cs CodeModelUtils.cs
                        FileUtils.cs VSExternalToolEventArgs.cs
                        VSExternalToolProxy.cs VSSolutionUtils.cs
                        ValidationUtils.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards
                        MDASolutionWizard.cs MDASolutionWizard.designer.cs
                        MDASolutionWizard.resx WelcomeWizard.Designer.cs
                        WelcomeWizard.cs WelcomeWizard.resx
  Added:       etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/SchemaExport
                        TestDataManager.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda
                        pom.xml
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
                        ConfigFile.cs SettingsManager.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven
                        Maven1Proxy.cs Maven2Proxy.cs MavenProxy.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
                        about_logo.jpg indicator_waitanim.gif pom.xml
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf
                        andromda-m2.xml
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf/mappings
                        MergeMappings.xml
  Removed:     etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
                        ConfigFile.cs MavenProxy.cs MavenProxyEventArgs.cs
                        SettingsManager.cs
               etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
                        arrow_right.png arrow_right1.png
  Log:
  - Added maven 2 support
  - Renamed add-in to Android/VS
  - Updated solution wizard
  
  Revision  Changes    Path
  1.12      +11 -6     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.11
  retrieving revision 1.12
  diff -u -w -r1.11 -r1.12
  --- AddInSettings.cs	12 Jul 2006 09:14:57 -0000	1.11
  +++ AddInSettings.cs	25 Jul 2006 13:09:28 -0000	1.12
  @@ -1,5 +1,5 @@
   
  -// AndroMDA Visual Studio 2005 Add-In
  +// Android/VS
   // (c)2006 AndroMDA.org
   
   #region Using statements
  @@ -22,7 +22,7 @@
       public class AddInSettings
       {
   
  -        public const int ADDIN_SETTINGS_VERSION = 8;
  +        public const int ADDIN_SETTINGS_VERSION = 9;
   
           #region Member variables
   
  @@ -37,7 +37,6 @@
           {
               m_applicationObject = applicationObject;
               m_settings = new SettingsManager(m_applicationObject);
  -            //FirstRun = true;
               if (FirstRun)
               {
                   FirstRun = false;
  @@ -47,14 +46,14 @@
   				MavenUseOfflineMode = true;
                   MavenCleanFirst = true;
                   MavenUseCustomCommandLine = false;
  -                MavenCustomCommandLine = "-o clean mda";
  +                MavenCustomCommandLine = string.Empty;
                   UMLModellerPath = "C:\\Program Files\\MagicDraw UML Community Edition\\bin\\mduml.exe";
   				PassSchemaExportArguments = true;
  -				SchemaExportCommandLine = "t t";
  +				SchemaExportCommandLine = "-o -e";
               }
   			else if (AddInBuild < 8)
   			{
  -				SchemaExportCommandLine = "t t";
  +				SchemaExportCommandLine = "-o -e";
   			}
   
   		}
  @@ -280,6 +279,12 @@
               set { m_settings.SetBool("AMDACdeGenE", value); }
           }
   
  +        public bool OnlyEnableCodeGenInDaoImpl
  +        {
  +            get { return m_settings.GetBool("AMDACdeGenD", true); }
  +            set { m_settings.SetBool("AMDACdeGenD", value); }
  +        }
  +
           #endregion
   
           #region Property mapper settings
  
  
  
  1.6       +34 -32    plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.AddIn
  
  Index: AndroMDA.VS80AddIn.AddIn
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.AddIn,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- AndroMDA.VS80AddIn.AddIn	11 Jul 2006 13:45:33 -0000	1.5
  +++ AndroMDA.VS80AddIn.AddIn	25 Jul 2006 13:09:28 -0000	1.6
  @@ -1,12 +1,14 @@
   <?xml version="1.0" encoding="UTF-8" standalone="no"?>
   <Extensibility xmlns="http://schemas.microsoft.com/AutomationExtensibility">
  +    
   	<HostApplication>
   		<Name>Microsoft Visual Studio</Name>
   		<Version>8.0</Version>
   	</HostApplication>
  +    
   	<Addin>
  -		<FriendlyName>AndroMDA Visual Studio 2005 Add-In</FriendlyName>
  -		<Description>Add-In for Visual Studio 2005 that makes working with AndroMDA easier.</Description>
  +        <FriendlyName>Android/VS</FriendlyName>
  +        <Description>Add-In that integrates Visual Studio 2005 with AndroMDA.</Description>
   		<AboutBoxDetails>For more information see the AndroMDA web site at http://www.andromda.org/</AboutBoxDetails>
   		<AboutIconData>0000010006002020100000000000E8020000660000001010100000000000280100004E0300002020000001000800A8080000760400001010000001000800680500001E0D00002020000001002000A8100000861200001010000001002000680400002E2300002800000020000000400000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF001111111111111111111111111111111111111111111111111111111000001111111111111111111111111110ABA01111111111111111111111111110BAB01111111111111111111111111110ABA01111111111110000000000F00000BAB00000111111118888888888F0ABABABABABA0111111118F77777777F0BABABABABAB0111111118F77777777F0ABABABABABA0111111118F77777777F00000BAB00000110001118F77777777FFFFF0ABA01111108880118F777777777777F0BAB01111887788008F777777777777F0ABA011118FF770778F777777777777F0000011118FFF78088F777777777777FFFFFF111118FF70118F7777777777777777801111118881118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118FFFFFFFFFFFFFFFFF801111111111118888888888888888888011111111111111111870111118701111111111111111111118F0111118F011111111111111111111108011111080111111111111111111110808011108080111111111111111111877788018777880111111111111111118FF778018FF7780111111111111111118FFF78018FFF7801111111111111111118FF701118FF7011111111111111111111777111117771111111111111111111111111111111111111111FFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFF000000FF000000FF000000FF000000FF000000C700000F8300000F0000000F0000000F0000000F8300000FC700000FFF00000FFF00000FFF00000FFF00000FFF00000FFFF8F8FFFFF8F8FFFFF8F8FFFFF0707FFFE0203FFFE0203FFFE0203FFFF0707FFFF8F8FFFFFFFFFF2800000010000000200000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF0011111111111111111111111111100011111111111110A011111111111000B00011110000F0ABABA011118F88F000B00011118F77FFF0A01170718F7777F000110F008F7777FFFF1170718F777777801111118FFFFFFF801111118888888880111111111101111111111111170711111111111110F01111111111111707111111FFFF1111FFE37777FFE3ABABFF80ABA0F0001111F0007777F0030000100300000003011110037777F003FFF0F0031111FF7F8011FE3F7777FE3F77F0FE3F1111280000002000000040000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0C0CF50CF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0D3938350CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD303939380DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD11395D390CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD35353535356139393110310D30FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD39666162616161613939393811FDFDFDFDFDFDFDFDFDFD3231073231323132083D858A61666261616161393935FDFDFDFDFDFDFDFDFD5E080909820982838608398A8A8A856165626161613D35FDFDFDFDFDFDFDFD82B3AF08080808080808AB39393939398A86613935353535FDFDFDFDFDFDFDFD86D1F6AFAFAFAFAF08AF0808D408D4398A6586390886FDFDFD5A073632FDFDFD86B3F6F6F6AFF6AFAFAFAF08AB0808398A8A8A39D432FDFD8286D4825A35FDFD82FFF6AFF6F6AFF6AF08D1AF08AFD43D8A8A8A610831FDFD5EFFAF088232363286FFFFF6F6AFF6AFF6AFAF08AF08085D61613D5DD4F5FDFD82F6F6AF085A825E82FFFFFFFFF6D1F6AFF6AFF6AFAFAF080808D408D431FDFD86D4FFFF095EFDFD09FFFFFFFFFFF6B3F6F6AFAFD108AFAFAF08AB09860DFDFDFD08825E86FDFDFD82FFFFFFFFFFFFF6F6AFF6F6AFF6AF08D1AF08088232FDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFF6AFF6AFF6AFAF08AF088331FDFDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFFFF6F6AFF6AFAFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFD86828682825EF75E5E5E5A5E5A5A07360736FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5E31FDFDFDFDFDFD5E31FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8232FDFDFDFDFDFD8232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5A360732FDFDFDFD5A360732FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8286D4823607FDFD8286D4823607FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFAF088232FDFD5EFFAF088232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF7D1FFAF0807FDFDF7D1FFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0808FFFF095EFDFD0808FFFF095EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0982F786FDFDFDFD0982F786FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FFC00000FF800000FF000000FF000003870000030300000300000003000000030300000387000003FF000003FF800007FFC0000FFFFCFCFFFFFCFCFFFFF8787FFFF0303FFFF0303FFFF0303FFFF0303FFFF8787FFFFFFFFFFFFFFFFF280000001000000020000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD353535FDFDFDFDFDFDFDFDFDFDFDFDFD356535FDFDFDFDFDFDFDFDFDFDFD39393985351111FDFDFDFDFDFDFDFDFD398A8A8A8A8935FDFDFDFDFDFD3131823D39398A393535FDFDFDFDFD32AF820808AB3DB239FDFDFDFDF5FDFD5AF6AFAFAF08393939FDFDFD5EFFF5F55EFFF6F6AFF6AF0886FDFDFDFD5EFDFD5EFFFFF6F6AFAFD4F5FDFDFDFDFDFDFDFDF75E5E5A5A0731FDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFDFDFFC7FDFDFFC7FDFDFF01FDFDFF01FD39F8016261F0076139B00738110007FDFDB007FDFDF80F3231FF7F3132FF7F083DFE3F6166FF7F6161FFFF39352800000020000000400000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002E5B35FC295231FF274F2FFF264D2EFF27502FFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000306138FE329A4FFF2C9649FF259244FF2A5432FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000356A3DFC3FA259FF389D54FF319A4EFF2E5D36FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000397341FE4DAB66FF45A65FFF3DA158FF316439FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045874CFF43854BFF42824AFF407E47FF3F7C46FF5BB471FF53AF6AFF4BAA64FF356B3DFF34683CFF33673BFF326439FF306038FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000519F58FF85CF94FF7FCA8FFF77C689FF70C183FF69BD7DFF61B876FF59B370FF51AE6AFF49A963FF42A55CFF3B9F56FF387040FF00000000000000000000000000000000000000000000000000000000000000000000000089715F4689715FFF866E5BFF846B59FF816855FF7E6552FF7B624FFF79604CFF846E5CFFCAC1B9FF55A85DFF8FD59CFF8AD198FF84CD93FF7DCA8EFF76C688FF6EC082FF67BB7CFF5FB775FF58B26EFF50AD67FF48A861FF3E7A46FF000000000000000000000000000000000000000000000000000000000000000089715F46AE998AFFD2C0B6FFD0BDB3FFCEBBB1FFCCB9AEFFCBB6ABFFCAB4A9FFC7B2A6FFCCB8ADFFD4C4BCFF5AB061FF97DAA3FF93D8A0FF8ED49CFF88D097FF83CC92FF7BC98CFF75C487FF6DC081FF65BB7AFF5EB673FF56B16DFF43854AFF0000000000000000000000000000000000000000000000000000000000000000C3AFA2FFF3EFECFFE6DEDAFFE0D4CEFFDFD2CAFFDDCEC7FFDACCC3FFD8C9C1FFD6C6BDFFD8C8C1FFE1D6CFFF59AB60FF58AA5EFF56A75DFF55A65DFF57AA5EFF8DD39BFF87CF97FF81CC91FF4F9B57FF4B9352FF498D50FF478C4FFC46894DFC0000000000000000000000000000000000000000000000000000000000000000C4B0A3FFF7F3F1FFF5F0EEFFF2EDEBFFEFEAE7FFEEE6E3FFEBE3DFFFE8DFDBFFE6DCD6FFE4D8D2FFE1D4CEFFDED0CAFFDCCDC6FFD9C9C2FFD6C6BDFF57AB5EFF95D9A2FF91D69EFF8CD29AFF519E58FFDED2CBFFC4BAB2FF0000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000C5B1A4FFF9F7F5FFF7F4F3FFF5F2EFFFF3EEECFFF0EBE8FFEFE8E4FFEDE4E1FFEAE1DDFFE7DDD8FFE4DAD4FFE2D7D0FFDFD3CCFFDCCEC8FFDACBC3FF5AAE62FF99DBA5FF99DAA4FF94D8A2FF54A45BFFDFD4CEFF846E5EFF0000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000C5B2A4FFFBFAF9FFF9F8F6FFF8F5F3FFF6F3F0FFF4EFEEFFF2ECEAFFF0EAE6FFEEE6E2FFEBE3DEFFE8DFDAFFE5DBD6FFE3D8D2FFE0D4CDFFDDD0C9FF5DB564FF99DBA5FF99DBA5FF99DBA5FF69B570FFDDD1CAFF69503BFF0000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8866E5BFF846B59FFC6B2A5FFFDFDFDFFFCFAFAFFFBF9F8FFF9F6F5FFF7F3F2FFF5F0EEFFF2EEECFFF0EBE8FFEEE7E4FFECE4E0FFE9E1DCFFE6DDD7FFE4D9D4FFE2D6D0FF5DB263FF62BF69FF62BF69FF61BE68FF6AB671FFDED2CBFF6C523EFF0000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8C7B1A6FFB39A8AFFC6B3A5FFFFFFFFFFFFFDFEFFFDFBFBFFFBFAF9FFF9F8F6FFF7F5F3FFF5F2F0FFF3EFEDFFF1ECE9FFEFE9E5FFEDE6E2FFEBE3DEFFE8DFDAFFE6DBD5FFE2D8D2FFE0D4CDFFDDCFC9FFDFD1CBFFDED2CBFFDDCFC7FF6F5541FF0000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000C7B3A6FFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFDFFFCFBFAFFFAF9F8FFF8F6F5FFF7F3F2FFF5F0EFFFF2EDEAFFF0EAE7FFEEE7E3FFEBE4DFFFE9E0DCFFE6DDD7FFE4D9D3FFE1D5CFFFDFD1CBFFD0BDB4FFC5B0A4FF725945FF0000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000C7B5A7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFEFDFFFCFCFBFFFBFAF8FFFAF7F6FFF7F5F2FFF6F2EFFFF3EFEDFFF2ECE9FFEFE9E5FFECE5E1FFEAE2DDFFE7DED9FFE5DBD5FFE2D7D1FFD3C2BAFFC8B3A8FF755C49FF00000000000000000000000000000000000000000000000000000000000000000000000000000000C8B5A8CAFFFFFFDAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFCFFFCFBFAFFFAF8F8FFF8F6F4FFF6F3F1FFF5F0EEFFF2EDEAFFF0EAE6FFEDE6E3FFEBE4DFFFE9E0DBFFE6DCD7FFDCCFC8FFCBB7ABFF795F4CFF0000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2FFFFFFCDFFFFFFEAFFFFFFF4FFFFFFFFFFFFFFFFFFFFFFFFFEFDFDFFFDFCFBFFFBFAF9FFFAF6F5FFF7F4F3FFF5F2EFFFF3EEECFFF1EBE8FFEFE8E5FFECE5E1FFEAE1DDFFE4DAD5FF866E5CFF866E5C46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2C3AFA2D3C0AD9EE8BDA99CFFBBA698FFB7A495FFB5A091FFB19C8DFFAE9989FFAB9585FFA79281FFA48E7DFFA08A7AFF9C8675FF988271FF957E6DFF917A68FF8A7260FF866E5C460000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B39A8AFF846B59FF000000000000000000000000000000000000000000000000B39A8AFF846B59FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C082685531000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF80000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF80000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB3100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FF800000FF000000FF000000FF000003030000030300000300000003000000030300000303000003FF000003FF000003FF800007FFFCFCFFFFFCFCFFFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFFFFFFFFFFFFFFF2800000010000000200000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFF4643854BFF407D47FF3B7643FFFFFFFF46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000488E50FF7BC88DFF3F7D47FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055A65CFF519E58FF4D9554FF8AD29AFF43854BFF407E47FF3C7643FF00000000000000000000000000000000000000000000000000000000000000000000000059AE60FFA4E3B2FF9FE0ADFF9ADCA8FF94D9A3FF8ED59FFF407E47FF000000000000000000000000000000000000000000000000755B46FF6E5541FFC0B5ACFF5CB463FF59AE60FF55A65CFFAAE7B7FF4C9653FF478D4FFF44854BFF00000000000000000000000000000000FFFFFF31856D5AFFEDE6E3FFBFA79AFFD5C6BDFFD7C8C0FFD3C5BCFF59AE60FFB9F0C3FF509E58FF0000000000000000000000006348333B634833FF6348333BFFFFFF6A97806FFFF6F2F1FFF2EDEAFFEDE6E3FFE8E0DCFFE4D9D3FF5DB464FF59AE60FF55A75CFF000000000000000000000000AE9A8BFFFFFFFFFF634833FF634833FFA99484FFFDFBFCFFF9F7F7FFF6F3F0FFF2EDEAFFEDE7E3FFEBE3E0FFD9CEC7FFC4BAB2FF0000000000000000000000006348333BAE9A8BFF6348333BFFFFFF79B29D8EFFFFFFFFFFFCFCFBFFFAF8F7FFF6F2F1FFF2EDEAFFE9E0DBFFDFD2CBFF694E3AFF000000000000000000000000000000000000000000000000FFFFFF4600000000B6A193FFAE9A8BFFA79181FF9F8979FF97806FFF876F5DFF785F4CFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000634833FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333F634833FF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000AE9A8BFFFFFFFFFF634833FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333FAE9A8BFF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFF0000FF830000FFC70000FF010000FF010000F8010000E0070000000700000007000000070000E80F0000FF7F0000FE3F0000FE3F0000FE3F0000FFFF0000</AboutIconData>
   		<Assembly>AndroMDA.VS80AddIn.dll</Assembly>
  
  
  
  1.18      +12 -3     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.17
  retrieving revision 1.18
  diff -u -w -r1.17 -r1.18
  --- AndroMDA.VS80AddIn.csproj	12 Jul 2006 09:14:57 -0000	1.17
  +++ AndroMDA.VS80AddIn.csproj	25 Jul 2006 13:09:28 -0000	1.18
  @@ -65,7 +65,7 @@
       <Compile Include="Commands\GenerateCodeCommand.cs" />
       <Compile Include="Commands\RunSolutionWizardCommand.cs" />
       <Compile Include="Commands\StopCommand.cs" />
  -    <Compile Include="ConfigFile.cs" />
  +    <Compile Include="Utils\ConfigFile.cs" />
       <Compile Include="Connect.cs" />
       <Compile Include="Controls\MDAProjectSetupControl.cs">
         <SubType>UserControl</SubType>
  @@ -89,7 +89,9 @@
       <Compile Include="Dialogs\PropertyMapperDialog.Designer.cs">
         <DependentUpon>PropertyMapperDialog.cs</DependentUpon>
       </Compile>
  -    <Compile Include="MavenProxy.cs" />
  +    <Compile Include="Maven\Maven1Proxy.cs" />
  +    <Compile Include="Maven\Maven2Proxy.cs" />
  +    <Compile Include="Maven\MavenProxy.cs" />
       <Compile Include="MDAProject.cs" />
       <Compile Include="MDASolutionManager.cs" />
       <None Include="Resources\Membership\DomainMembershipProvider.cs" />
  @@ -122,6 +124,7 @@
       <Compile Include="OptionsPages\SolutionExplorerOptionsPage.designer.cs">
         <DependentUpon>SolutionExplorerOptionsPage.cs</DependentUpon>
       </Compile>
  +    <EmbeddedResource Include="Resources\SchemaExport\TestDataManager.cs" />
       <Compile Include="Utils\CodeModelUtils.cs" />
       <Compile Include="WizardSolutionProcessor.cs" />
       <Compile Include="AddInSettings.cs" />
  @@ -130,7 +133,7 @@
         <DesignTime>True</DesignTime>
         <DependentUpon>Resource1.resx</DependentUpon>
       </Compile>
  -    <Compile Include="SettingsManager.cs" />
  +    <Compile Include="Utils\SettingsManager.cs" />
       <Compile Include="SharpZipLib\Checksums\Adler32.cs" />
       <Compile Include="SharpZipLib\Checksums\CRC32.cs" />
       <Compile Include="SharpZipLib\Checksums\IChecksum.cs" />
  @@ -314,7 +317,13 @@
       <None Include="Resources\expandall.gif" />
       <None Include="Resources\issue.gif" />
       <None Include="Resources\link_break.gif" />
  +    <None Include="Resources\indicator_waitanim.gif" />
  +    <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" />
       <Content Include="Resources\mda\src\uml\empty.model.membership.xml" />
  +    <None Include="Resources\pom.xml" />
       <None Include="Resources\settings.xml" />
       <None Include="Resources\rightbox.bmp" />
       <None Include="Resources\orange.bmp" />
  
  
  
  1.7       +3 -3      plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AssemblyInfo.cs
  
  Index: AssemblyInfo.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/AssemblyInfo.cs,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- AssemblyInfo.cs	7 Jul 2006 22:32:14 -0000	1.6
  +++ AssemblyInfo.cs	25 Jul 2006 13:09:28 -0000	1.7
  @@ -1,5 +1,5 @@
   
  -// AndroMDA Visual Studio 2005 Add-In
  +// Android/VS
   // (c)2006 AndroMDA.org
   
   #region Using statements
  @@ -14,11 +14,11 @@
   // set of attributes. Change these attribute values to modify the information
   // associated with an assembly.
   //
  -[assembly: AssemblyTitle("AndroMDA Visual Stuio 2005 Add-In")]
  +[assembly: AssemblyTitle("Android/VS")]
   [assembly: AssemblyDescription("Add-In for Visual Stuio 2005 to integrate the AndroMDA toolchain.")]
   [assembly: AssemblyConfiguration("")]
   [assembly: AssemblyCompany("AndroMDA.org")]
  -[assembly: AssemblyProduct("AndroMDA")]
  +[assembly: AssemblyProduct("Android/VS")]
   [assembly: AssemblyCopyright("(c) 2006 AndroMDA.org")]
   [assembly: AssemblyTrademark("")]
   [assembly: AssemblyCulture("")]
  
  
  
  1.4       +1 -1      plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Connect.cs
  
  Index: Connect.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Connect.cs,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- Connect.cs	7 Jul 2006 22:32:14 -0000	1.3
  +++ Connect.cs	25 Jul 2006 13:09:28 -0000	1.4
  @@ -1,5 +1,5 @@
   
  -// AndroMDA Visual Studio 2005 Add-In
  +// Android/VS
   // (c)2006 AndroMDA.org
   
   #region Using statements
  
  
  
  1.2       +1 -1      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.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- ConversionCodeGenerator.cs	12 Jul 2006 09:14:57 -0000	1.1
  +++ ConversionCodeGenerator.cs	25 Jul 2006 13:09:28 -0000	1.2
  @@ -1,5 +1,5 @@
   
  -// AndroMDA Visual Studio 2005 Add-In
  +// Android/VS
   // (c)2006 AndroMDA.org
   
   #region Using statements
  
  
  
  1.5       +1 -1      plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDAProject.cs
  
  Index: MDAProject.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MDAProject.cs,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- MDAProject.cs	7 Jul 2006 22:32:14 -0000	1.4
  +++ MDAProject.cs	25 Jul 2006 13:09:28 -0000	1.5
  @@ -1,5 +1,5 @@
    
  -// AndroMDA Visual Studio 2005 Add-In
  +// Android/VS
   // (c)2006 AndroMDA.org
   
   #region Using statements
  
  
  
  1.15      +65 -16    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.14
  retrieving revision 1.15
  diff -u -w -r1.14 -r1.15
  --- MDASolutionManager.cs	7 Jul 2006 22:32:14 -0000	1.14
  +++ MDASolutionManager.cs	25 Jul 2006 13:09:28 -0000	1.15
  @@ -1,5 +1,5 @@
   
  -// AndroMDA Visual Studio 2005 Add-In
  +// Android/VS
   // (c)2006 AndroMDA.org
   
   #region Using statements
  @@ -98,7 +98,7 @@
           {
               get 
               {
  -                string lastRun = m_solutionSettings["vsmdaaddin.maven.lastrun"];
  +                string lastRun = m_solutionSettings["android.lastgenerated"];
                   if (lastRun == string.Empty)
                       return null;
                   else
  @@ -108,7 +108,7 @@
               {
                   try
                   {
  -                    m_solutionSettings["vsmdaaddin.maven.lastrun"] = value.ToString();
  +                    m_solutionSettings["android.lastgenerated"] = value.ToString();
                       m_solutionSettings.Save();
                   }
                   catch (Exception e)
  @@ -174,7 +174,7 @@
           {
               m_applicationObject = applicationObject;
               m_addInSettings = addInSettings;
  -			m_mavenProxy = new MavenProxy(m_applicationObject, m_addInSettings);
  +            m_mavenProxy = new Maven2Proxy(m_applicationObject, m_addInSettings);
   			m_mavenProxy.Completed += new EventHandler(m_mavenProxy_Completed);
           }
   
  @@ -190,16 +190,45 @@
               {
                   try
                   {
  +
                       // Notify the user that the solution is using MDA
  -                    m_applicationObject.StatusBar.Text = "AndroMDA: Solution is AndroMDA-enabled.  Loading configuration...";
  +                    m_applicationObject.StatusBar.Text = "Android/VS: Solution is AndroMDA-enabled.  Loading configuration...";
                       m_applicationObject.StatusBar.Highlight(true);
   
                       // Get the solution path
                       string solutionPath = VSSolutionUtils.GetSolutionPath(m_applicationObject.Solution);
   
                       /// Load the properties file and set the the root directory                
  -                    m_projectProperties.LoadFromFile(GetProjectPropertiesPath(m_applicationObject.Solution));
  +                    if (Maven1PropertiesExist(m_applicationObject.Solution))
  +                    {
  +                        // Load the properties directly from the project.properties file
  +                        m_projectProperties.LoadFromFile(GetMaven1ProjectPropertiesPath(m_applicationObject.Solution));
  +                        m_projectProperties["maven.version"] = "1";
  +                    }
  +                    else if (Maven2PropertiesExist(m_applicationObject.Solution))
  +                    {
  +                        // Load the properties from the pom.xml
  +                        m_projectProperties.LoadFromXML(GetMaven2ProjectPropertiesPath(m_applicationObject.Solution), "maven.andromda.");
  +                        m_projectProperties["maven.version"] = "2";
  +                    }
  +                    else
  +                    {
  +                        throw new Exception("Unable to locate the project's properties file.");
  +                    }
                       m_projectProperties["maven.src.dir"] = solutionPath + "\\mda\\src";
  +                    m_projectProperties["project.build.sourceDirectory"] = solutionPath + "\\mda\\src\\uml";
  +                    m_projectProperties["pom.basedir"] = solutionPath + "\\mda";
  +
  +                    if (m_projectProperties["maven.version"] == "2" && m_mavenProxy is Maven1Proxy)
  +                    {
  +                        m_mavenProxy = new Maven2Proxy(m_applicationObject, m_addInSettings);
  +                    }
  +                    else if (m_projectProperties["maven.version"] == "1" && m_mavenProxy is Maven2Proxy)
  +                    {
  +                        m_mavenProxy = new Maven1Proxy(m_applicationObject, m_addInSettings);
  +                    }
  +
  +                    m_mavenProxy.Completed += new EventHandler(m_mavenProxy_Completed);
   
                       ////
                       ////  Resolve the core and common projects
  @@ -263,9 +292,9 @@
                           errorMessage += " could not be found for some reason.  AndroMDA add-in support is being temporarily disabled.\nPlease check the AndroMDA configuration files and reload the solution or click the Reload MDA Config button.";
                           throw new Exception(errorMessage);
                       }
  -                    m_solutionSettings = new ConfigFile(solutionPath + "\\mda\\vsmdaaddin.properties");
  +                    m_solutionSettings = new ConfigFile(solutionPath + "\\mda\\android.user.properties");
                       m_applicationObject.StatusBar.Highlight(false);
  -                    m_applicationObject.StatusBar.Text = "AndroMDA: Configuration loaded.";
  +                    m_applicationObject.StatusBar.Text = "Android/VS: AndroMDA configuration loaded.";
                       m_enabled = true;
                   }
                   catch (Exception e)
  @@ -295,7 +324,7 @@
   				{
                       if (!AreGeneratedFilesUpToDate && m_addInSettings.PromptToGenerateOnBuildIfFilesOutOfDate)
   					{
  -						System.Windows.Forms.DialogResult result = System.Windows.Forms.MessageBox.Show("The UML model has been updated since the last time code was generated.\nWould you like to regenerate code from the model?", "AndroMDA Add-In", System.Windows.Forms.MessageBoxButtons.YesNoCancel, System.Windows.Forms.MessageBoxIcon.Question);
  +						System.Windows.Forms.DialogResult result = System.Windows.Forms.MessageBox.Show("The UML model has been updated since the last time code was generated.\nWould you like to regenerate code from the model?", "Android/VS", System.Windows.Forms.MessageBoxButtons.YesNoCancel, System.Windows.Forms.MessageBoxIcon.Question);
   						if (result == System.Windows.Forms.DialogResult.Yes)
   						{
   							m_restartBuild = true;
  @@ -494,7 +523,7 @@
   			// Sync core/target
   			ResyncFolder(m_coreProject.GeneratedPathProjectItem, m_coreProject.GeneratedPath, m_coreProject.Name);
   
  -			m_applicationObject.StatusBar.Progress(false, "AndroMDA: Resync complete", 1, 1);
  +			m_applicationObject.StatusBar.Progress(false, "Android/VS: Resync complete", 1, 1);
   
   		}
   
  @@ -564,7 +593,7 @@
               {
                   ProjectItem newItem = item.ProjectItems.AddFromFile(file);
                   Property prop = newItem.Properties.Item("BuildAction");
  -                if (file.EndsWith(".hbm.xml"))
  +                if (file.ToLower().Trim().EndsWith(".hbm.xml"))
                   {
                       prop.Value = VSLangProj.prjBuildAction.prjBuildActionEmbeddedResource;
                   }
  @@ -756,7 +785,7 @@
               {
                   detail = "(" + detail + ")";
               }
  -            m_applicationObject.StatusBar.Progress(true, "AndroMDA: Refreshing generated files... " + detail, currentProgress, totalProgress);
  +            m_applicationObject.StatusBar.Progress(true, "Android/VS: Refreshing generated files... " + detail, currentProgress, totalProgress);
           }
   
           private void UpdateProgressBar(string text, int currentProgress, int totalProgress)
  @@ -773,14 +802,34 @@
   
           private static bool MDAConfigFilesExist(Solution currentSolution)
           {
  -            return System.IO.File.Exists(GetProjectPropertiesPath(currentSolution));
  +            bool exists = Maven2PropertiesExist(currentSolution);
  +            if (!exists)
  +            {
  +                exists = Maven1PropertiesExist(currentSolution);
  +            }
  +            return exists;
  +        }
  +
  +        private static bool Maven2PropertiesExist(Solution currentSolution)
  +        {
  +            return System.IO.File.Exists(GetMaven2ProjectPropertiesPath(currentSolution));
           }
   
  -        private static string GetProjectPropertiesPath(Solution currentSolution)
  +        private static bool Maven1PropertiesExist(Solution currentSolution)
  +        {
  +            return System.IO.File.Exists(GetMaven1ProjectPropertiesPath(currentSolution));
  +        }
  +
  +        private static string GetMaven1ProjectPropertiesPath(Solution currentSolution)
           {
               return VSSolutionUtils.GetSolutionPath(currentSolution) + "\\mda\\project.properties";
           }
   
  +        private static string GetMaven2ProjectPropertiesPath(Solution currentSolution)
  +        {
  +            return VSSolutionUtils.GetSolutionPath(currentSolution) + "\\mda\\pom.xml";
  +        }
  +
           #endregion
   
   		#region Statistics methods
  
  
  
  1.10      +157 -13   plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.Designer.cs
  
  Index: Resource1.Designer.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.Designer.cs,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -r1.9 -r1.10
  --- Resource1.Designer.cs	11 Jul 2006 13:45:33 -0000	1.9
  +++ Resource1.Designer.cs	25 Jul 2006 13:09:28 -0000	1.10
  @@ -60,6 +60,13 @@
               }
           }
           
  +        internal static System.Drawing.Bitmap about_logo {
  +            get {
  +                object obj = ResourceManager.GetObject("about_logo", resourceCulture);
  +                return ((System.Drawing.Bitmap)(obj));
  +            }
  +        }
  +        
           /// <summary>
           ///   Looks up a localized string similar to maven.repo.remote=http://www.ibiblio.org/maven,http://team.andromda.org/maven.
           /// </summary>
  @@ -165,6 +172,13 @@
               }
           }
           
  +        internal static System.Drawing.Bitmap indicator_waitanim {
  +            get {
  +                object obj = ResourceManager.GetObject("indicator_waitanim", resourceCulture);
  +                return ((System.Drawing.Bitmap)(obj));
  +            }
  +        }
  +        
           internal static System.Drawing.Bitmap issue {
               get {
                   object obj = ResourceManager.GetObject("issue", resourceCulture);
  @@ -294,6 +308,30 @@
           ///        &lt;repository name=&quot;netBeansMDR&quot;&gt;
           ///            &lt;models&gt;
           ///                &lt;model&gt;
  +        ///                    &lt;uri&gt;${model.uri}&lt;/uri&gt;
  +        ///                 [rest of string was truncated]&quot;;.
  +        /// </summary>
  +        internal static string mda_conf_andromda_m2_xml {
  +            get {
  +                return ResourceManager.GetString("mda_conf_andromda_m2_xml", resourceCulture);
  +            }
  +        }
  +        
  +        /// <summary>
  +        ///   Looks up a localized string similar to &lt;andromda&gt;
  +        ///    &lt;properties&gt;
  +        ///        &lt;property name=&quot;modelValidation&quot;&gt;true&lt;/property&gt;
  +        ///        &lt;property name=&quot;cartridgeFilter&quot;&gt;${filter}&lt;/property&gt;
  +        ///        &lt;!-- &lt;property name=&quot;loggingConfigurationUri&quot;&gt;file:log4j.xml&lt;/property&gt; --&gt;
  +        ///    &lt;/properties&gt;
  +        ///    &lt;server&gt;
  +        ///        &lt;host&gt;localhost&lt;/host&gt;
  +        ///        &lt;port&gt;4446&lt;/port&gt;
  +        ///    &lt;/server&gt;
  +        ///    &lt;repositories&gt;
  +        ///        &lt;repository name=&quot;netBeansMDR&quot;&gt;
  +        ///            &lt;models&gt;
  +        ///                &lt;model&gt;
           ///                    &lt;uri&gt;${maven.andromda.model.uri}&lt;/uri&gt;
           ///  [rest of string was truncated]&quot;;.
           /// </summary>
  @@ -304,6 +342,31 @@
           }
           
           /// <summary>
  +        ///   Looks up a localized string similar to &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
  +        ///&lt;mappings name=&quot;MergeMappings&quot;&gt;
  +        ///
  +        ///    &lt;!-- Standard header for all C# files --&gt;
  +        ///    &lt;mapping&gt;
  +        ///        &lt;from&gt;&lt;![CDATA[// license-header cs merge-point]]&gt;&lt;/from&gt;
  +        ///        &lt;to&gt;&lt;![CDATA[
  +        /////
  +        ///// License text for C# files - Change in mda/conf/mappings/MergeMappings.xml
  +        /////
  +        ///]]&gt;&lt;/to&gt;        
  +        ///    &lt;/mapping&gt;
  +        ///
  +        ///    &lt;!-- Standard header for all hibernate mapping files --&gt;
  +        ///    &lt;mapping&gt;
  +        ///        &lt;from&gt;&lt;![CDATA[license-header hbm merge-point]]&gt;&lt;/from&gt;
  +        ///        &lt;to&gt;&lt;![CDATA[ [rest of string was truncated]&quot;;.
  +        /// </summary>
  +        internal static string mda_conf_mappings_MergeMappings_xml {
  +            get {
  +                return ResourceManager.GetString("mda_conf_mappings_MergeMappings_xml", resourceCulture);
  +            }
  +        }
  +        
  +        /// <summary>
           ///   Looks up a localized string similar to vsmdaaddin.properties.
           /// </summary>
           internal static string mda_cvsignore {
  @@ -327,9 +390,27 @@
           }
           
           /// <summary>
  +        ///   Looks up a localized string similar to &lt;project xmlns=&quot;http://maven.apache.org/POM/4.0.0&quot;
  +        ///         xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
  +        ///         xsi:schemaLocation=&quot;http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd&quot;&gt;
  +        ///    &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
  +        ///    &lt;parent&gt;
  +        ///        &lt;groupId&gt;${wizard.application.name.nospaces}&lt;/groupId&gt;
  +        ///        &lt;artifactId&gt;${wizard.application.name.nospaces}&lt;/artifactId&gt;
  +        ///        &lt;version&gt;1.0&lt;/version&gt;
  +        ///    &lt;/parent&gt;
  +        ///    &lt;artifactId&gt;${wizard.application.name.nospaces}-md [rest of string was truncated]&quot;;.
  +        /// </summary>
  +        internal static string mda_pom_xml {
  +            get {
  +                return ResourceManager.GetString("mda_pom_xml", resourceCulture);
  +            }
  +        }
  +        
  +        /// <summary>
           ///   Looks up a localized string similar to maven.multiproject.type=pom
           ///
  -        ///maven.andromda.model.uri=jar:file:${maven.src.dir}/uml/${wizard.application.model.filename}!/${wizard.application.model.filename.unzipped}
  +        ///maven.andromda.model.uri=jar:file:${maven.src.dir}/uml/${wizard.application.model.uri}
           ///
           ///# Configures AndroMDA
           ///maven.andromda.configuration.uri=file:${maven.conf.dir}/andromda.xml
  @@ -338,7 +419,8 @@
           ///maven.andromda.run.without.ant=true
           ///
           ///# Define the assembly names for Common and Core projects
  -        ///maven.andromda.commonAssemblyName=${wizard.projects.common.n [rest of string was truncated]&quot;;.
  +        ///maven.andromda.commonAssemblyName=${wizard.projects.common.name}
  +        ///maven.andromda.coreAssemblyName=${wizard.proje [rest of string was truncated]&quot;;.
           /// </summary>
           internal static string mda_project_properties {
               get {
  @@ -580,6 +662,24 @@
           }
           
           /// <summary>
  +        ///   Looks up a localized string similar to &lt;project xmlns=&quot;http://maven.apache.org/POM/4.0.0&quot;
  +        ///         xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
  +        ///         xsi:schemaLocation=&quot;http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd&quot;&gt;
  +        ///    &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
  +        ///    &lt;groupId&gt;${wizard.application.name.nospaces}&lt;/groupId&gt;
  +        ///    &lt;artifactId&gt;${wizard.application.name.nospaces}&lt;/artifactId&gt;
  +        ///    &lt;packaging&gt;pom&lt;/packaging&gt;
  +        ///    &lt;version&gt;1.0&lt;/version&gt;
  +        ///    &lt;name&gt;${wizard.application.name.nospaces}&lt;/name&gt;
  +        ///    &lt;description&gt;$ [rest of string was truncated]&quot;;.
  +        /// </summary>
  +        internal static string pom_xml {
  +            get {
  +                return ResourceManager.GetString("pom_xml", resourceCulture);
  +            }
  +        }
  +        
  +        /// <summary>
           ///   Looks up a localized string similar to # ---------- Default Build Properties ----------
           ///# Change this to generate to the correct MDA database mappings
           ///# For SQL Server use: MSSQL
  @@ -664,22 +764,34 @@
           }
           
           /// <summary>
  -        ///   Looks up a localized string similar to using System;
  +        ///   Looks up a localized string similar to //
  +        ///// SchemaExport
  +        ///// 
  +        ///
  +        ///#region Using Statements
  +        ///
  +        ///using System;
  +        ///using System.IO;
  +        ///using System.Configuration;
           ///using NHibernate;
           ///using AndroMDA.NHibernateSupport;
           ///
  +        ///#endregion
  +        ///
           ///namespace ${wizard.solution.name}.SchemaExport
           ///{
           ///    class Program
           ///    {
  +        ///
           ///        public static void Main(string[] args)
           ///        {
  -        ///            // Show usage information
  -        ///            Console.WriteLine();
  -        ///            Console.WriteLine(&quot;Usage:&quot;);
  -        ///            Console.WriteLine(&quot;  SchemaExport [script] [export]&quot;);
  -        ///            Console.WriteLine(&quot;      script=t outputs DDL to the console&quot;);
  -        ///            Console.WriteLine(&quot;      export=t [rest of string was truncated]&quot;;.
  +        ///
  +        ///			// Initialize Log4Net
  +        ///			log4net.Config.XmlConfigurator.Configure();
  +        ///			
  +        ///			// Get the schema files
  +        ///			string createSchemaFile = ConfigurationManager.AppSettings[&quot;schema.create.file&quot;];
  +        ///			string [rest of string was truncated]&quot;;.
           /// </summary>
           internal static string SchemaExport_Program_cs {
               get {
  @@ -688,6 +800,38 @@
           }
           
           /// <summary>
  +        ///   Looks up a localized string similar to //
  +        ///// TestDataManager.cs
  +        ///// 
  +        ///
  +        ///#region Using Statements
  +        ///
  +        ///using System;
  +        ///using System.Configuration;
  +        ///using NHibernate;
  +        ///using AndroMDA.NHibernateSupport;
  +        ///
  +        ///#endregion
  +        ///
  +        ///namespace ${wizard.solution.name}.SchemaExport
  +        ///{
  +        ///	public class TestDataManager
  +        ///	{
  +        ///		public static void InsertTestData()
  +        ///		{
  +        ///            // Insert test data here
  +        ///		}
  +        ///	}
  +        ///}
  +        ///.
  +        /// </summary>
  +        internal static string SchemaExport_TestDataManager_cs {
  +            get {
  +                return ResourceManager.GetString("SchemaExport_TestDataManager_cs", resourceCulture);
  +            }
  +        }
  +        
  +        /// <summary>
           ///   Looks up a localized string similar to &lt;settings&gt;
           ///    &lt;profiles&gt; 
           ///        &lt;profile&gt; 
  
  
  
  1.10      +40 -19    plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.resx
  
  Index: Resource1.resx
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resource1.resx,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -r1.9 -r1.10
  --- Resource1.resx	11 Jul 2006 13:45:33 -0000	1.9
  +++ Resource1.resx	25 Jul 2006 13:09:28 -0000	1.10
  @@ -118,9 +118,6 @@
       <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </resheader>
     <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  -  <data name="build_properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
  -    <value>Resources\build.properties;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
  -  </data>
     <data name="web_web_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
       <value>Resources\Web\web.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
     </data>
  @@ -145,8 +142,8 @@
     <data name="SchemaExport_App_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
       <value>Resources\SchemaExport\App.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
     </data>
  -  <data name="lib_Bamboo_Prevalence_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
  -    <value>Resources\Lib\Bamboo.Prevalence.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  +  <data name="build_properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
  +    <value>Resources\build.properties;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
     </data>
     <data name="lib_NHibernate_Nullables2_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
       <value>Resources\Lib\NHibernate.Nullables2.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  @@ -160,6 +157,9 @@
     <data name="orange" type="System.Resources.ResXFileRef, System.Windows.Forms">
       <value>Resources\orange.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
     </data>
  +  <data name="indicator_arrows" type="System.Resources.ResXFileRef, System.Windows.Forms">
  +    <value>Resources\indicator_arrows.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  +  </data>
     <data name="Membership_UserDaoImpl_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
       <value>Resources\Membership\UserDaoImpl.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
     </data>
  @@ -172,14 +172,17 @@
     <data name="settings_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
       <value>Resources\settings.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
     </data>
  +  <data name="link_break" type="System.Resources.ResXFileRef, System.Windows.Forms">
  +    <value>Resources\link_break.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  +  </data>
     <data name="web_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
       <value>Resources\Web\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </data>
     <data name="Membership_DomainMembershipUser_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
       <value>Resources\Membership\DomainMembershipUser.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
     </data>
  -  <data name="project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
  -    <value>Resources\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
  +  <data name="lib_Bamboo_Prevalence_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
  +    <value>Resources\Lib\Bamboo.Prevalence.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </data>
     <data name="cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
       <value>Resources\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  @@ -202,9 +205,15 @@
     <data name="mda_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
       <value>Resources\mda\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
     </data>
  +  <data name="Membership_DomainRoleProvider_cs" type="System.Resources.ResXFileRef, System.Windows.Forms">
  +    <value>Resources\Membership\DomainRoleProvider.cs;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
  +  </data>
     <data name="lib_NHibernate_Caches_SysCache_dll" type="...
 
[truncated message content]

[Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn

[Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf/mappings MergeMappings.xml