Menu
▾
▴
andromdaplugins-cvs — Each commit to the project CVS repository posts a message to this mailing list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(178) |
Feb
(169) |
Mar
(286) |
Apr
(117) |
May
(98) |
Jun
(68) |
Jul
(63) |
Aug
(121) |
Sep
(88) |
Oct
(124) |
Nov
(2) |
Dec
(111) |
| 2007 |
Jan
(224) |
Feb
(69) |
Mar
(10) |
Apr
(72) |
May
(7) |
Jun
(21) |
Jul
(33) |
Aug
(35) |
Sep
(12) |
Oct
(22) |
Nov
(5) |
Dec
(6) |
| 2008 |
Jan
(2) |
Feb
(10) |
Mar
(39) |
Apr
(58) |
May
(34) |
Jun
(9) |
Jul
(27) |
Aug
(10) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
|
From: Eric C. <ecr...@us...> - 2006-08-04 16:16:58
|
User: ecrutchfield
Date: 06/08/04 09:16:58
Modified: andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda
pom.xml.vsl
Log:
change packaging from jar to pom and remove 'eclipse' plugin goal
Revision Changes Path
1.3 +7 -24 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/pom.xml.vsl
Index: pom.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/pom.xml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- pom.xml.vsl 11 Mar 2006 17:24:00 -0000 1.2
+++ pom.xml.vsl 4 Aug 2006 16:16:58 -0000 1.3
@@ -8,7 +8,7 @@
<version>$applicationVersion</version>
</parent>
<artifactId>${applicationId}-mda</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>$applicationName MDA</name>
<dependencies>
<dependency>
@@ -58,14 +58,14 @@
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-validation-library</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
#end
#if (!$transactionPersistenceType.equals("none"))
<dependency>
<groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
</dependency>
#end
</dependencies>
@@ -88,23 +88,6 @@
</configuration>
#end
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>andromdapp-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>eclipse</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>mda/pom.xml</exclude>
- <exclude>webservice/pom.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
<properties>
|
User: ecrutchfield
Date: 06/08/04 09:14:21
Modified: andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/schema-export
App.config nhibernate.config.vsl Program.cs
Added: andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/schema-export
SchemaExport.csproj AssemblyInfo.cs App.ico
Log:
Updated to support latest AndroMDA.NHibernateSupport.dll and 'regenerating' of a database.
Revision Changes Path
1.2 +37 -34 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/schema-export/App.config
Index: App.config
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/schema-export/App.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- App.config 5 Mar 2006 06:16:55 -0000 1.1
+++ App.config 4 Aug 2006 16:14:20 -0000 1.2
@@ -19,7 +19,7 @@
<!-- levels: DEBUG, INFO, WARN, ERROR, FATAL -->
<root>
- <level value="WARN"/>
+ <level value="INFO"/>
<appender-ref ref="NHibernateLog"/>
</root>
@@ -30,6 +30,9 @@
<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.2 +13 -13 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/schema-export/nhibernate.config.vsl
Index: nhibernate.config.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/schema-export/nhibernate.config.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- nhibernate.config.vsl 5 Mar 2006 06:16:55 -0000 1.1
+++ nhibernate.config.vsl 4 Aug 2006 16:14:20 -0000 1.2
@@ -8,7 +8,7 @@
<property name="hibernate.connection.connection_string">server=localhost;database=${applicationId};Integrated Security=SSPI;</property>
<property name="hibernate.use_outer_join">true</property>
<property name="hibernate.query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
- <property name="hibernate.cache.provider_class">NHibernate.Caches.SysCache.SysCacheProvider, NHibernate.Caches.SysCache</property>
+ <!--property name="hibernate.cache.provider_class">NHibernate.Caches.SysCache.SysCacheProvider, NHibernate.Caches.SysCache</property-->
<property name="hibernate.show_sql">false</property>
<!-- mapping files -->
<mapping assembly="${applicationId}Core" />
1.2 +98 -41 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/schema-export/Program.cs
Index: Program.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/schema-export/Program.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- Program.cs 5 Mar 2006 06:16:55 -0000 1.1
+++ Program.cs 4 Aug 2006 16:14:20 -0000 1.2
@@ -1,47 +1,104 @@
using System;
-using NHibernate;
+using System.Configuration;
+using System.Data;
+using System.IO;
using AndroMDA.NHibernateSupport;
+using log4net;
namespace SchemaExport
{
class Program
{
+
public static void Main(string[] args)
{
+ string createDDL = ConfigurationSettings.AppSettings.Get("schema.create.file");
+ string dropDDL = ConfigurationSettings.AppSettings.Get("schema.drop.file");
+
+ string msg = String.Empty;
+
// Show usage information
- Console.WriteLine();
- Console.WriteLine("Usage:");
- Console.WriteLine(" SchemaExport [script] [export]");
- Console.WriteLine(" script=t outputs DDL to the console");
- Console.WriteLine(" export=t exports schema to the database");
- Console.WriteLine("Example:");
- Console.WriteLine(" SchemaExport t f");
- Console.WriteLine();
+ string usage = @"Usage:
+ SchemaExport [-o|-e]
+ -o = outputs DDL to the console
+ -e = exports schema to the database
+ The following example will display the DDL, AND change the database schema:
+ SchemaExport -o -e
+ The following example will display the DDL, but NOT change the database schema:
+ SchemaExport -o
+
+";
// Initialize Log4Net
log4net.Config.XmlConfigurator.Configure();
- // Start NHibernate
- SessionManagerFactory.SessionManager = new ThreadLocalSessionManager();
- SessionManagerFactory.SessionManager.HandleApplicationStart();
-
// Initialize parameters for SchemaExport
- bool script = true;
+ bool script = false;
bool export = false;
- if (args.Length >= 1)
- { script = args[0].ToLower().Equals("t"); }
- if (args.Length >= 2)
- { export = args[1].ToLower().Equals("t"); }
-
- // Call CreateDatabase with the specified parameters
- Console.WriteLine(
- "Calling CreateDatabase with script = " + script +
- " and export = " + export + "...");
- Console.WriteLine();
- DbSupport.CreateDatabase(script, export);
- // Stop NHibernate
- SessionManagerFactory.SessionManager.HandleApplicationEnd();
+ foreach (string arg in args)
+ {
+ switch (arg)
+ {
+ case "-o":
+ script = true;
+ break;
+ case "-e":
+ export = true;
+ break;
+ }
+ }
+
+ //They need to enter one of the switches, otherwise we'll kick them out.
+ if (!export && !script)
+ {
+ Console.WriteLine(usage);
+ return;
+ }
+
+ string outScript = String.Empty;
+ DbSupport dbSupport = new DbSupport();
+ if (export)
+ {
+ if (createDDL == null || createDDL.Trim().Length == 0)
+ createDDL = "schema-create.sql";
+ if (dropDDL == null || dropDDL.Trim().Length == 0)
+ dropDDL = "schema-drop.sql";
+
+ //Use the supplied file name to create a FileInfo object to pass to
+ //the DbSupport method.
+ FileInfo createFile = new FileInfo(createDDL);
+ FileInfo deleteFile = new FileInfo(dropDDL);
+
+ try
+ {
+ outScript = dbSupport.RegenerateDatabase(createFile, deleteFile);
+
+ Console.WriteLine("SchemaExport COMPLETED SUCCESSFULLY!");
+ msg = "\r\n\r\nThe new tables will be in the database defined by the 'hibernate.connection.connection_string' property in the nhibernate.config file.\r\n\r\nAlso, SQL scripts containing the commands required to create and remove all the tables for this version of the schema were saved in the '{0}' and '{1}' files.";
+ Console.WriteLine(String.Format(msg, createFile.FullName, deleteFile.FullName));
+ }
+ catch (Exception)
+ {
+ Console.WriteLine("SchemaExport ENCOUNTERED PROBLEMS!");
+ msg = "\r\n\r\nIn some cases, this will be a non-issue. Look back through the errors generated by SchemaExport (in the log file) to determine the specific failure. You may need to manually drop the tables and rerun this program to have the new schema fully generated.\r\n\r\nA SQL script containing the commands required to remove all the tables added by this version of the schema was saved in the {0} file.";
+ Console.WriteLine(String.Format(msg, deleteFile.FullName));
+ }
+ }
+ else
+ {
+ //we still need the delete and create scripts to send to the console.
+ string[] dropSql = dbSupport.GenerateDropSQL();
+ string[] createSql = dbSupport.GenerateCreateSQL();
+ outScript += String.Join(Environment.NewLine, dropSql);
+ outScript += String.Join(Environment.NewLine, createSql);
+ }
+
+ if (script)
+ Console.WriteLine(outScript);
+
+ dbSupport.Dispose();
+ dbSupport = null;
}
}
}
\ No newline at end of file
1.1 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/schema-export/SchemaExport.csproj
Index: SchemaExport.csproj
===================================================================
<VisualStudioProject>
<CSHARP
ProjectType = "Local"
ProductVersion = "7.10.3077"
SchemaVersion = "2.0"
ProjectGuid = "{D34BE505-BD1E-46DF-BA39-882E26EBA5AF}"
>
<Build>
<Settings
ApplicationIcon = "App.ico"
AssemblyKeyContainerName = ""
AssemblyName = "SchemaExport"
AssemblyOriginatorKeyFile = ""
DefaultClientScript = "JScript"
DefaultHTMLPageLayout = "Grid"
DefaultTargetSchema = "IE50"
DelaySign = "false"
OutputType = "Exe"
PreBuildEvent = ""
PostBuildEvent = 'xcopy /Y "$(ProjectDir)nhibernate.config" .'
RootNamespace = "SchemaExport"
RunPostBuildEvent = "OnBuildSuccess"
StartupObject = "SchemaExport.Program"
>
<Config
Name = "Debug"
AllowUnsafeBlocks = "false"
BaseAddress = "285212672"
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "DEBUG;TRACE"
DocumentationFile = ""
DebugSymbols = "true"
FileAlignment = "4096"
IncrementalBuild = "false"
NoStdLib = "false"
NoWarn = ""
Optimize = "false"
OutputPath = "bin\Debug\"
RegisterForComInterop = "false"
RemoveIntegerChecks = "false"
TreatWarningsAsErrors = "false"
WarningLevel = "4"
/>
<Config
Name = "Release"
AllowUnsafeBlocks = "false"
BaseAddress = "285212672"
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "TRACE"
DocumentationFile = ""
DebugSymbols = "false"
FileAlignment = "4096"
IncrementalBuild = "false"
NoStdLib = "false"
NoWarn = ""
Optimize = "true"
OutputPath = "bin\Release\"
RegisterForComInterop = "false"
RemoveIntegerChecks = "false"
TreatWarningsAsErrors = "false"
WarningLevel = "4"
/>
</Settings>
<References>
<Reference
Name = "System"
AssemblyName = "System"
HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
/>
<Reference
Name = "System.Data"
AssemblyName = "System.Data"
HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
/>
<Reference
Name = "System.XML"
AssemblyName = "System.Xml"
HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
/>
<Reference
Name = "AndroMDA.NHibernateSupport"
Project = "{8349509A-0F7D-411A-AA7B-176AA6452911}"
Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
/>
<Reference
Name = "log4net"
AssemblyName = "log4net"
HintPath = "..\..\Lib\log4net.dll"
/>
<Reference
Name = "core"
Project = "{C953435E-5623-4A29-AA67-3A462F7183E6}"
Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
/>
</References>
</Build>
<Files>
<Include>
<File
RelPath = "App.config"
BuildAction = "None"
/>
<File
RelPath = "App.ico"
BuildAction = "Content"
/>
<File
RelPath = "AssemblyInfo.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "nhibernate.config"
BuildAction = "None"
/>
<File
RelPath = "Program.cs"
SubType = "Code"
BuildAction = "Compile"
/>
</Include>
</Files>
</CSHARP>
</VisualStudioProject>
1.1 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/schema-export/AssemblyInfo.cs
Index: AssemblyInfo.cs
===================================================================
using System.Reflection;
using System.Runtime.CompilerServices;
//
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
[assembly: AssemblyTitle("")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
// Microsoft .NET Framework documentation for more information on assembly signing.
//
// Use the attributes below to control which key is used for signing.
//
// Notes:
// (*) If no key is specified, the assembly is not signed.
// (*) KeyName refers to a key that has been installed in the Crypto Service
// Provider (CSP) on your machine. KeyFile refers to a file which contains
// a key.
// (*) If the KeyFile and the KeyName values are both specified, the
// following processing occurs:
// (1) If the KeyName can be found in the CSP, that key is used.
// (2) If the KeyName does not exist and the KeyFile does exist, the key
// in the KeyFile is installed into the CSP and used.
// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
// When specifying the KeyFile, the location of the KeyFile should be
// relative to the project output directory which is
// %Project Directory%\obj\<configuration>. For example, if your KeyFile is
// located in the project directory, you would specify the AssemblyKeyFile
// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
// documentation for more information on this.
//
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]
1.1 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/schema-export/App.ico
<<Binary file>>
|
|
From: Eric C. <ecr...@us...> - 2006-08-04 16:07:15
|
User: ecrutchfield
Date: 06/08/04 09:07:14
Modified: andromdapp/projects/csharp/maven2 pom.xml
Log:
pull dll's from etc/andromda-net/Lib
Revision Changes Path
1.3 +36 -5 plugins/andromdapp/projects/csharp/maven2/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- pom.xml 6 Mar 2006 20:28:35 -0000 1.2
+++ pom.xml 4 Aug 2006 16:07:13 -0000 1.3
@@ -18,21 +18,52 @@
<build>
<resources>
<resource>
+ <directory>${pom.basedir}/../../../../etc/andromda-dotnet/Lib/AndroMDA.NHibernateSupport</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <targetPath>templates/csharp/maven2/lib</targetPath>
+ </resource>
+ <resource>
+ <directory>${pom.basedir}/../../../../etc/andromda-dotnet/Lib/NHibernate</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <targetPath>templates/csharp/maven2/lib</targetPath>
+ </resource>
+ <resource>
+ <directory>${pom.basedir}/../../../../etc/andromda-dotnet/Lib/NHibernate.Nullables2</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <targetPath>templates/csharp/maven2/lib</targetPath>
+ </resource>
+ <resource>
+ <directory>${pom.basedir}/../../../../etc/andromda-dotnet/Lib/NHibernateContrib</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <targetPath>templates/csharp/maven2/lib</targetPath>
+ </resource>
+ <resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
<excludes>
<exclude>**/configuration.xml</exclude>
+ <exclude>templates/csharp/maven2/common/pom-with-CS-plugin.xml.vsl</exclude>
</excludes>
</resource>
- <resource>
+ <!-- The empty model exists in the andromda repository, but not in the
+ andromdaplugins repo. So, we'll just have to copy it manually for now.-->
+ <!-- resource>
<directory>${pom.basedir}/../../../../etc/mda/uml</directory>
<includes>
<include>**/*</include>
</includes>
<targetPath>templates/csharp/maven2/mda/src/main/uml</targetPath>
- </resource>
+ </resource-->
</resources>
</build>
</project>
\ No newline at end of file
|
|
From: Eric C. <ecr...@us...> - 2006-08-04 16:06:29
|
User: ecrutchfield Date: 06/08/04 09:06:19 Added: andromdapp/projects/csharp/maven2 readme.txt Removed: andromdapp/projects/csharp/maven2 readme Log: renamed file Revision Changes Path 1.1 plugins/andromdapp/projects/csharp/maven2/readme.txt Index: readme.txt =================================================================== NOTE: You must have Maven 2.0.1 or higher AND the Maven 2 version of AndroMDA 3.2-RC1-SNAPSHOT installed to use this plugin. To install the CSharp project generator you must download the source from CVS (http://cvs.sourceforge.net/viewcvs.py/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/). You'll also need to download and install the AndroMDA .NET Application Generator Maven Plugin from CVS (http://cvs.sourceforge.net/viewcvs.py/andromdaplugins/plugins/maven2/plugins/andromdanetapp/). Once you have both of these installed locally, you can execute the following command to generate a new .NET AndroMDA project: mvn andromdanetapp:generate Select 'dotnet' when prompted for the type of project to generate. |
|
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
|
|
From: Chris M. <cm...@us...> - 2006-07-30 05:33:28
|
User: cmicali
Date: 06/07/29 22:33:27
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AddInSettings.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven
Maven2Proxy.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages
AboutOptionsPage.cs AboutOptionsPage.designer.cs
AboutOptionsPage.resx ExternalToolsOptionsPage.cs
ExternalToolsOptionsPage.designer.cs
ExternalToolsOptionsPage.resx
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda
pom.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml
empty.model.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
pom.xml settings.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards
MDASolutionWizard.cs WelcomeWizard.Designer.cs
WelcomeWizard.cs WelcomeWizard.resx
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer
AndroidVS-1.4-beta4-Setup.exe
Removed: etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer
AndroidVS-1.4-beta3-Setup.exe
Log:
- Fixed version error in models output by the solution wizard
- Cleaned up the maven build scripts output by the solution wizard
- Updated maven 2 proxy to show maven download status in the status bar
- Fixed potential crash in VSExternalToolProxy
- Changed add in settings prefix so new installs will have their settings reset
Revision Changes Path
1.13 +78 -58 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.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- AddInSettings.cs 25 Jul 2006 13:09:28 -0000 1.12
+++ AddInSettings.cs 30 Jul 2006 05:33:25 -0000 1.13
@@ -12,6 +12,7 @@
using EnvDTE;
using EnvDTE80;
+using System.Collections;
#endregion
@@ -22,6 +23,8 @@
public class AddInSettings
{
+ public const string SETTING_NAME_PREFIX = "ARDV";
+
public const int ADDIN_SETTINGS_VERSION = 9;
#region Member variables
@@ -51,11 +54,10 @@
PassSchemaExportArguments = true;
SchemaExportCommandLine = "-o -e";
}
- else if (AddInBuild < 8)
+ if (AddInBuild < ADDIN_SETTINGS_VERSION)
{
- SchemaExportCommandLine = "-o -e";
+ AddInBuild = ADDIN_SETTINGS_VERSION;
}
-
}
#endregion
@@ -64,33 +66,33 @@
public bool FirstRun
{
- get { return m_settings.GetBool("AMDAFirstRun", true); }
- set { m_settings.SetBool("AMDAFirstRun", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "FirstRun", true); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "FirstRun", value); }
}
public bool ShowWelcomeWizard
{
- get { return m_settings.GetBool("AMDAShowWiz", true); }
- set { m_settings.SetBool("AMDAShowWiz", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "ShowWiz", true); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "ShowWiz", value); }
}
public bool PromptToGenerateOnBuildIfFilesOutOfDate
{
- get { return m_settings.GetBool("AMDABdPrmptO", true); }
- set { m_settings.SetBool("AMDABdPrmptO", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "BdPrmptO", true); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "BdPrmptO", value); }
}
public bool PromptToGenerateOnBuildIfSolutionNotSynched
{
- get { return m_settings.GetBool("AMDABdPrmptS", false); }
- set { m_settings.SetBool("AMDABdPrmptS", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "BdPrmptS", false); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "BdPrmptS", value); }
}
public int AddInBuild
{
get
{
- int? build = m_settings.GetInt("AMDABuild");
+ int? build = m_settings.GetInt(SETTING_NAME_PREFIX + "Build");
if (build.HasValue)
{
return build.Value;
@@ -100,7 +102,7 @@
return -1;
}
}
- set { m_settings.SetInt("AMDABuild", value); }
+ set { m_settings.SetInt(SETTING_NAME_PREFIX + "Build", value); }
}
#endregion
@@ -109,20 +111,20 @@
public string ResyncIgnoreList
{
- get { return m_settings["AMDAIgnoreLst"]; }
- set { m_settings["AMDAIgnoreLst"] = value; }
+ get { return m_settings[SETTING_NAME_PREFIX + "IgnoreLst"]; }
+ set { m_settings[SETTING_NAME_PREFIX + "IgnoreLst"] = value; }
}
public bool ResyncIgnoreHiddenFiles
{
- get { return m_settings.GetBool("AMDARIHdnFl", false); }
- set { m_settings.SetBool("AMDARIHdnFl", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "RIHdnFl", false); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "RIHdnFl", value); }
}
public bool ShowResyncButton
{
- get { return m_settings.GetBool("AMDARShBtn", false); }
- set { m_settings.SetBool("AMDARShBtn", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "RShBtn", false); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "RShBtn", value); }
}
#endregion
@@ -131,26 +133,26 @@
public string UMLModellerPath
{
- get { return m_settings["AMDAMgcDrawPth"]; }
- set { m_settings["AMDAMgcDrawPth"] = value; }
+ get { return m_settings[SETTING_NAME_PREFIX + "MgcDrawPth"]; }
+ set { m_settings[SETTING_NAME_PREFIX + "MgcDrawPth"] = value; }
}
public string SchemaExportCommandLine
{
- get { return m_settings["AMDAScExCmdLn"]; }
- set { m_settings["AMDAScExCmdLn"] = value; }
+ get { return m_settings[SETTING_NAME_PREFIX + "ScExCmdLn"]; }
+ set { m_settings[SETTING_NAME_PREFIX + "ScExCmdLn"] = value; }
}
public bool PassSchemaExportArguments
{
- get { return m_settings.GetBool("AMDAScExPass", true); }
- set { m_settings.SetBool("AMDAScExPass", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "ScExPass", true); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "ScExPass", value); }
}
public bool AutoMakeModelFileWritable
{
- get { return m_settings.GetBool("AMDAMdlWritbl", false); }
- set { m_settings.SetBool("AMDAMdlWritbl", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "MdlWritbl", false); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "MdlWritbl", value); }
}
#endregion
@@ -159,26 +161,26 @@
public bool MavenUseOfflineMode
{
- get { return m_settings.GetBool("AMDAMavenOffln"); }
- set { m_settings.SetBool("AMDAMavenOffln", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "MavenOffln"); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "MavenOffln", value); }
}
public bool MavenCleanFirst
{
- get { return m_settings.GetBool("AMDAMavenClean"); }
- set { m_settings.SetBool("AMDAMavenClean", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "MavenClean"); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "MavenClean", value); }
}
public bool MavenUseCustomCommandLine
{
- get { return m_settings.GetBool("AMDAMavenUseCC"); }
- set { m_settings.SetBool("AMDAMavenUseCC", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "MavenUseCC"); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "MavenUseCC", value); }
}
public string MavenCustomCommandLine
{
- get { return m_settings["AMDAMavenCCLN"]; }
- set { m_settings["AMDAMavenCCLN"] = value; }
+ get { return m_settings[SETTING_NAME_PREFIX + "MavenCCLN"]; }
+ set { m_settings[SETTING_NAME_PREFIX + "MavenCCLN"] = value; }
}
#endregion
@@ -187,15 +189,15 @@
public bool ToolBarVisible
{
- get { return m_settings.GetBool("AMDATBVisible", true); }
- set { m_settings.SetBool("AMDATBVisible", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "TBVisible", true); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "TBVisible", value); }
}
public MsoBarPosition ToolBarPosition
{
get
{
- string pos = m_settings["AMDATBPos"];
+ string pos = m_settings[SETTING_NAME_PREFIX + "TBPos"];
if (pos == string.Empty)
{
return MsoBarPosition.msoBarTop;
@@ -207,26 +209,26 @@
}
set
{
- m_settings["AMDATBPos"] = value.ToString();
+ m_settings[SETTING_NAME_PREFIX + "TBPos"] = value.ToString();
}
}
public int? ToolBarTop
{
- get { return m_settings.GetInt("AMDATBTop"); }
- set { m_settings.SetInt("AMDATBTop", value); }
+ get { return m_settings.GetInt(SETTING_NAME_PREFIX + "TBTop"); }
+ set { m_settings.SetInt(SETTING_NAME_PREFIX + "TBTop", value); }
}
public int? ToolBarLeft
{
- get { return m_settings.GetInt("AMDATBLeft"); }
- set { m_settings.SetInt("AMDATBLeft", value); }
+ get { return m_settings.GetInt(SETTING_NAME_PREFIX + "TBLeft"); }
+ set { m_settings.SetInt(SETTING_NAME_PREFIX + "TBLeft", value); }
}
public int? ToolBarRowIndex
{
- get { return m_settings.GetInt("AMDATBRowIdx"); }
- set { m_settings.SetInt("AMDATBRowIdx", value); }
+ get { return m_settings.GetInt(SETTING_NAME_PREFIX + "TBRowIdx"); }
+ set { m_settings.SetInt(SETTING_NAME_PREFIX + "TBRowIdx", value); }
}
#endregion
@@ -263,26 +265,26 @@
public bool ShowPropertyMapper
{
- get { return m_settings.GetBool("AMDAPrpMapE", true); }
- set { m_settings.SetBool("AMDAPrpMapE", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "PrpMapE", true); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "PrpMapE", value); }
}
public bool ShowInsertEntityConversion
{
- get { return m_settings.GetBool("AMDAEntConS", true); }
- set { m_settings.SetBool("AMDAEntConS", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "EntConS", true); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "EntConS", value); }
}
public bool OnlyEnableCodeGenOnConversionMethods
{
- get { return m_settings.GetBool("AMDACdeGenE", true); }
- set { m_settings.SetBool("AMDACdeGenE", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "CdeGenE", true); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "CdeGenE", value); }
}
public bool OnlyEnableCodeGenInDaoImpl
{
- get { return m_settings.GetBool("AMDACdeGenD", true); }
- set { m_settings.SetBool("AMDACdeGenD", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "CdeGenD", true); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "CdeGenD", value); }
}
#endregion
@@ -291,13 +293,31 @@
public bool PropertyMapperAutoMapOnOpen
{
- get { return m_settings.GetBool("AMDAPMAMOO", false); }
- set { m_settings.SetBool("AMDAPMAMOO", value); }
+ get { return m_settings.GetBool(SETTING_NAME_PREFIX + "PMAMOO", false); }
+ set { m_settings.SetBool(SETTING_NAME_PREFIX + "PMAMOO", value); }
}
#endregion
- #region Helper methods
+ #region Methods
+
+ public void EraseAllSettings()
+ {
+ EraseAllSettings(SETTING_NAME_PREFIX);
+ }
+
+ public void EraseAllSettings(string prefix)
+ {
+ IList variables = (IList)m_applicationObject.Globals.VariableNames;
+ foreach (string varname in variables)
+ {
+ if (varname.StartsWith(prefix))
+ {
+ m_applicationObject.Globals[varname] = string.Empty;
+ m_applicationObject.Globals.set_VariablePersists(varname, false);
+ }
+ }
+ }
public bool IsInIgnoreList(string fileToTest)
{
1.2 +19 -1 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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- Maven2Proxy.cs 25 Jul 2006 13:09:33 -0000 1.1
+++ Maven2Proxy.cs 30 Jul 2006 05:33:25 -0000 1.2
@@ -39,10 +39,28 @@
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"))
+ 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"))
+ {
+ string[] t = text.Split('/');
+ if (t.Length == 2)
+ {
+ int current = int.Parse(t[0]);
+ int total = int.Parse(t[1].Remove(t[1].Length - 1));
+ OutputWindow.DTE.StatusBar.Progress(true, "AndroMDA: Maven: Downloading file... " + text, current, total);
+ cancelOutput = true;
+ }
+ }
+ else if (text.EndsWith("K downloaded"))
+ {
+ OutputWindow.DTE.StatusBar.Progress(false, "Android/VS: Generation Progress",0,0);
+ }
+ }
}
public override void BeforeStart()
1.3 +1 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.cs
Index: AboutOptionsPage.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/AboutOptionsPage.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- AboutOptionsPage.cs 25 Jul 2006 13:09:30 -0000 1.2
+++ AboutOptionsPage.cs 30 Jul 2006 05:33:25 -0000 1.3
@@ -154,6 +154,7 @@
Kapil Viren Ahuja\par
Manish Agrawal\par
Vaneet Kaur\par
+Karthick Pachiappan\par
\b\par
}";
1.3 +3 -3 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- AboutOptionsPage.designer.cs 25 Jul 2006 13:09:30 -0000 1.2
+++ AboutOptionsPage.designer.cs 30 Jul 2006 05:33:25 -0000 1.3
@@ -87,13 +87,13 @@
//
this.lblVersion.BackColor = System.Drawing.Color.Black;
this.lblVersion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblVersion.ForeColor = System.Drawing.Color.LightGray;
- this.lblVersion.Location = new System.Drawing.Point(113, 71);
+ this.lblVersion.ForeColor = System.Drawing.Color.Gray;
+ this.lblVersion.Location = new System.Drawing.Point(300, 68);
this.lblVersion.Name = "lblVersion";
this.lblVersion.Size = new System.Drawing.Size(73, 13);
this.lblVersion.TabIndex = 0;
this.lblVersion.Text = "version";
- this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// tabControl1
//
1.3 +71 -71 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- AboutOptionsPage.resx 25 Jul 2006 13:09:30 -0000 1.2
+++ AboutOptionsPage.resx 30 Jul 2006 05:33:25 -0000 1.3
@@ -380,82 +380,82 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACC
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB4
EQAAAk1TRnQBSQFMAgEBAwEAAQQBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
- AwABEAMAAQEBAAEgBgABEBoAAYECHwH/AXwCHwH/AXwCHwH/AXwCHwH/AXwCHwH/AXwCHwH/AXwCHwH/
- AXwCHwH/AXwCHwH/AXwCHwH/AXwCHwH/AX0CHwH/AbcCHwH/EAABBwIBAQcBHgIBASgBPgIBAWcBTwIC
+ AwABEAMAAQEBAAEgBgABEBoAAYECIQH/AX4CIQH/AX4CIQH/AX4CIQH/AX4CIQH/AX4CIQH/AX4CIQH/
+ AX4CIQH/AX4CIQH/AX4CIQH/AX4CIQH/AX8CIQH/AbcCIQH/EAABBwIBAQcBHgIBASgBPgIBAWcBTwIC
AZkBVgICAa0BVQICAa4BUgICAaIBRAIBAXcBJwIBATgBDAIBAQ4BAgMBDAABBwIBAQgBTwICAZkBZAIF
AeQBWwICAb0BSwICAYwBPAIBAWQBJQIBATUBHAIBASYBRQIBAXsBVgICAa8BUgICAaUBQwIBAXMBGgIB
ASIBAgMBTAAB7AHaAdMC/wHoAdYC/wHmAdIC/wHlAc4C/wHiAcoC/wHhAcYC/wHgAcMC/wHdAb8C/wHc
- AbsC/wHaAbgC/wHZAbMB/wGLAXUBcQH/AbMCHwH/DAABCgIBAQwBMwIBAU8BnQFrAWcB/AH0AegB4wH/
+ AbsC/wHaAbgC/wHZAbMB/wGLAXcBcwH/AbMCIQH/DAABCgIBAQwBMwIBAU8BmQFnAWMB/AH0AegB4wH/
AvQB8wH/AfAB8gHzAf8B8QHyAfMB/wH0Ae0B6QH/Ae4B2wHQAf8BYgIDAdQBQQIBAXABFAIBARkBAgMB
- CAABXgIDAcUD1AP/AfkD/wH7Av8B+wH2Af8BywG3AaMB/wF0AQsBCgHzAbYCQwH9Af8CxgL/AtoC/wLp
- Af8ByAKpAf8BVwICAbYBKQIBATwBAgMBSAAB4gHZAdIC/wHqAdUC/wHoAc8C/wHlAcoC/wHiAcQC/wHe
- Ab8C/wHdAboC/wHaAbUC/wHYAbEC/wHWAasC/wHUAaMB/wGJAXMBdwH/AbMCHwH/CAABCQIBAQoBRQIB
- AXkB9QHrAeUB/wHwAfEB8gH/AeQB3QHbAf8BvgGLAYEB/wHCAYEBcQH/AcwBjwGBAf8B3wHOAcQB/wHt
- AfAB8gH/AfYC9AH/AX8BKQEoAfgBRgIBAX0BEgIBARYBAgMBBAADtwH/AcECwgL/AfYB7gH/AVgBrAFR
- Af8BsAHZAaUB/wHvAcYBjQH/AccCgQL/AqEC/wKyAv8CxAL/AtQC/wL+Af8B8QLqAf8BVwICAbEBGAIB
- AR9IAAHkAd0B1gL/Ae0B2wL/AeoB1gL/AegB0QL/AeoBxwH/AcEBugHSAv8B5wG+Av8B3gG7Av8B2wG2
- Av8B2AGxAv8B1wGpAf8BiwF1AXgB/wGzAh8B/wgAATACAQFKAfcB8QHtAf8B8AH0AfUB/wHIAYEBfAH/
- Ab8BegFJAf8BwgGBAVcB/wHsAe4B7wH/AdIBiAGBAf8BwAF9AUwB/wG9AX8BUQH/AeoB6QHoAf8B9QH2
- AfcB/wF2AgkB8QE7AgEBYAEIAgEBCQQAA78B/wLZAdoC/wHuAd8B/wEmAbABNwH/AS8BrQE6Af8BXQGB
- AUgC/wK1Av8CngL/AqAC/wGxAbAC/wHFAcMJ/wGiAn8B/gFAAgEBbUgAAeYB4AHbAv8B8wHmAv8B8wHm
- Av8B7gG+Af8BQwFfAe8B/wEfAVIC/wF/AYEB4AL/Ad4BvQL/Ad4BvQL/Ad4BvQL/Ad4BvQH/AY4BeAF5
- Af8BswIfAf8IAAHxAd4B0wH/AfQC9gH/AcQBgQFiAf8BxQGBAVEB/wHLAYEBUgH/AcABgQFmAf8B/gP/
- AdkBqAGPAf8BygGBAVIB/wHHAYEBUAH/AbwBdwFFAf8B7gHvAfAB/wH2Ae4B6gH/AVgCAgG6ARwCAQEl
- BAADywH/AdsC3AL/AeYBzgH/AUMBzAFjAf8BPAG+AVAB/wGmAYgBgQL/AsMC/wKwAv8B0QHZAf8B+AGx
- AcwC/wHnBv8B/QH8Af0B/wH8AvsB/wFTAgIBpEgAAekB4wHfAv8B5gHJAf8BkAGPAckB/wEfAUcC/wEf
- AUgC/wEwAV8C/wEfAUkC/wH5AdwBrAL/Ad4BvQL/Ad4BvQL/AdwBtAH/AY4BeQF6Af8BswIfAf8EAAEx
- AgEBSwH5AfoB+QH/AeEBwQGxAf8BxgGBAVEB/wHMAYEBVAH/AcwBgQFTAf8BzAGBAVEB/wHKAX8BSgH/
- AcsBgQFOAf8BzAGBAVIB/wHLAYEBUwH/AccBgQFRAf8BxgGBAWwB/wHzAvUB/wGYAWYBYQH8ATQCAQFS
- BAADzwH/Ad8B4AHiAv8B3QG8Af8BYQHqAYEB/wFOAdMBawH/AcsBnAGfAv8CzQL/AsMC/wH0AfwB/wGi
- AswB/wGtAYIBgQH/AfcB8wHyAf8B6wHiAd8B/wHwAekB5QH/AVoCAwHCSAAB6wHmAeMC/wHlAckB/wF0
- AYEB8wH/AUMBaQL/AfwB5AG5Av8B6QGyAf8BHwFGAv8BOwFeAfMC/wHcAawC/wHVAawC/wHeAbkB/wGP
- AXoBfAH/AbMCHwH/BAABagIFAeEB+gH9Af4B/wHGAYEBVQH/Ac0BgQFVAf8BzQGBAVQB/wHMAYEBUgH/
- AccBgQFWBf8B2gGRAYEB/wHMAYEBUgH/AcwBgQFTAf8BywGBAVMB/wHBAXsBRwH/A/EB/wHyAd8B1QH/
- AUQCAQF3BAAD0gH/AeMB5gHoAv8B1wGqAf8BXAHCAeAB/wFoAbMC/wGdAYEBjgL/AsoC/wLWAv8B9QL/
- AcsBoQGeAf8B3QGUAZgC/wHFAcYC/wKyAv8CygH/AVsCAgG9SAAB7QHqAecC/wHnAc4C/wHkAcIC/wHj
- Ab4C/wHeAb0C/wHcAboB/wKlAdkB/wEfAU8C/wHGAbMBvAL/AdcBrwL/AeEBvgH/AZMBfAF+Af8BswIf
- Af8EAAG5AZUBjgL+A/8BygGBAVEB/wHQAYEBVwH/AcwBgQFSAf8BzAGBAVIB/wHMAYEBTgH/AeQB6gHs
- Af8B+gHxAewB/wHKAX8BSwH/AcwBgQFSAf8BzQGBAVQB/wHIAYEBUQH/AesB2wHTAf8B9QHpAeMB/wFI
- AgIBggQAAdcB0wHLAf8B8gG4AYEC/wHPAZwB/wGwAbsBxQH/AYEBtgHjAf8BYAFxAaMO/wHLAegC/wHJ
- AdgC/wKcAv8CoAH/Af0CsgH/AUMCAQF1SAAB7wHtAesC/wHoAdEC/wHhAcMC/wHgAcAC/wHfAb4C/wHd
- AbsC/wHlAbUB/wEqAVQC/wEfAUYD/wHeAb0C/wHkAcQB/wGUAX4BgAH/AbMCHwH/BAAB8AHcAdEF/wHS
- AYEBWAH/AdMBgQFaAf8BzAGBAVIB/wHMAYEBUgH/AcwBgQFSAf8BxQGBAVgB/wH2AfkB+wH/AfsB8QHt
- Af8BywGBAUwB/wHPAYEBVgH/AcwBgQFVAf8B7gHbAdIB/wH3AewB5QH/AUYCAQF8BAAB2wHBAZ0B/wHi
- AagBfgL/AccBigL/AckBjwL/AckBjgL/AckBkAH/Ab4BoAGkBv8C/gL/As8C/wLDAv8CsQL/Ap4B/wG5
- AkAB/QEVAgEBG0gAAfIC8QL/AecB0QL/AeABwAL/Ad8BvwL/Ad0BvAL/AdwBugL/AdsBuAH/Ae0B1gG/
- Af8BHwFMAv8BfwGBAdsC/wHmAckB/wGYAYABgQH/AbMCHwH/BAABcgIbAfUE/wHfAYEBZQH/AdsBgQFj
- Af8BzgGBAVQB/wHLAYABSwH/AcsBgQFPAf8BzAGBAVIB/wHEAYEBawX/AdwBlAGBAf8B0gGBAVoB/wHP
- AYEBVQH/AfsB9QHzAf8B9QHkAdwB/wE6AgEBXwQAAdsBxwGyAf8D2QL/AboBgAL/AbsBgQL/AbwBgQL/
- Ab0BgQH/AfkBugGBAf8BxQGrAa0C/wL3Av8C4QL/AtAC/wLGAf8B0gKPAf8BHwIBASoBAgMBSAAB9ALz
- Av8B4gHGAv8B1wGxAv8B1wGwAv8B1gGvAv8B1gGtAv8B1gGsAv8B1wGpAf8BZQGBAfMB/wH8Ad0BpQL/
- AekBzwH/AZoBgAGBAf8BswIfAf8EAAFIAgIBgAT/AfsByQGuAf8B7gGKAXYB/wHSAYEBZwH/AfEB9gH5
- Af8B6wHCAa4B/wHLAYEBTgH/AcoBgQFiBf8B3wGlAYkB/wHcAYEBZAH/AdgBgQFjBf8BuAGTAYwB/gEj
- AgEBMQQAA9EB/wHHAcoBzQH/Af4BrQFVAf8B8wHxAe8B/wHyAdYBqgH/AfQBvwGBAf8B+gGuAV0C/wGo
- AT4B/wHIAYEBWQH/Ab4BkQGFAf8BsgJTAf0BWwICAbgBFAIBARlQAAL2AfUC/wHhAcIC/wHWAawC/wHV
- AasC/wHVAasC/wHUAakC/wHUAakC/wHTAagC/wHVAaYC/wHRAaQC/wHtAdYB/wGcAX4BfwH/AbMCHwH/
- CAAB9gHoAeAG/wGjAYEB/wH6AZUBgAH/Ac0BxgHDBf8B/AH1AfEF/wH2AfsB/QH/AeYBgwFxAf8B6wGD
- AW4B/wH9AfUB7gH/Af4C/AH/AU0CAgGTAQwCAQEOBAAD6AH/AeoC6wH/Ac0BtAG1Af8B5wLcAf8B9QL3
- Af8B7wLxAf8B6gHsAe0B/wHhAeQB5gH/AdsB3wHlAf8B1gHYAdoB/wGoAYoBgwH+AWsCBgHpARcCAQEd
- UAAC+AH1Cv8B/gP/AfsB+QL/AfkB9AL/AfYB7wL/AfQB6gL/AfMB5gH/AfsB8AHjAv8B8QHXAf8BnwF6
- AXsB/wGwAh8B/wgAAUoCAgGGCf8B0AGcAv8BuwGHAf8B6QG/AaoB/wHXAccBwAH/Ad8ByQG/Af8B/AGp
- AYEC/wGkAYEC/wHoAdcF/wGdAWsBZwH8AR4CAQEoAQMCAQECAQQCAQEEAd8C3gH/Ad0BywG8Af8BtgKB
- Af8BqwKBAf8BsAKBAf8BswKBAf8BuwGEAYUB/wHKAp8B/wHqAuwB/wHpAuoB/wF/AiwB+AEnAgEBOFQA
- AfoB+QH3Dv8C/gL/AfsB+AL/AfkB9AL/AfYB7gH/Ae4B3wHaAf8B8QGYAUEB/wHeAYEBKwH/AboBiQGB
- Af8BygIfAf8IAAECAwEBYAIDAdMK/wHtAv8B+wHRAv8B7wG7Av8B5AGxAv8B6wHNCf8BugGWAY8B/gEj
- AgEBMQEEAgEBBAQAATwCAQFkAfUB+QH+Af8B/QHDAYEC/wHMAZcC/wHNAZ8C/wHPAakC/wHRAbEB/wH9
- AcoBtgH/AfMBwQG3Av8C2wL/AuQB/wHvAugB/wFGAgEBfAEDAgEBA1AAAf0B+gH4Ev8C/gL/AfwB+QL/
- AfkB9AH/Ae8B4QHcAv8BzwGBAf8BugGJAYEB/wHKAh8B/xAAAQIDAQFGAgEBewH1AeYB3hX/AfoB8QHs
- Af8BawIGAekBGAIBAR8BAwIBAQMIAAFLAgIBiwH+AbcBegH/Af4BywGWAv8BzAGfAv8BzgGoAv8BzgGw
- Av8BzgG4Av8BzQHAAf8BvAGLAYgB/gFsAgcB6wH/Av0F/wFMAgIBjgEIAgEBCVAAAfcB0gGvAf8B8gHL
- AasB/wHqAcQBpwH/AeEBuwGiAf8B2QGzAZ0B/wHQAaoBmAH/AcoBpAGUAf8ByAGiAZMB/wHIAaIBkwH/
- AboBiQGBAf8BygIfAf8gAAFAAgEBbQFxAgcB7AG6AZYBjgH+AY0BQgFAAfoBUgICAZ4gAAECAwEBAgMB
- ARQCAQEaASgCAQE5ATcCAQFYAUoCAgGFAU4CAgGPARQCAQEaAS0CAQFEAQoCAQEMAQIDAUwAAUIBTQE+
- BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAHAAQEB4AEDAYABAQIAAcABAQHAAQEBgAMA
- AcABAQGAAQABgAMAAcABAQGAAQABgAMAAcABAQGAAQABgAMAAcABAQIAAYADAAHAAQECAAGAAwABwAEB
- AgABgAMAAcABAQIAAYADAAHAAQECAAGAAwABwAEBAgABgAEDAgABwAEBAYABAAGAAQMCAAHAAQEBgAIA
- AQcCAAHAAQEBgAEBAQABAwIAAcABAwHAAQMBAAEDAgABwAEHAfgBPwHAAQcCAAs=
+ 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/
+ 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
+ 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/
+ 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==
</value>
</data>
</root>
\ No newline at end of file
1.3 +5 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/ExternalToolsOptionsPage.cs
Index: ExternalToolsOptionsPage.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/ExternalToolsOptionsPage.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ExternalToolsOptionsPage.cs 25 Jul 2006 13:09:30 -0000 1.2
+++ ExternalToolsOptionsPage.cs 30 Jul 2006 05:33:25 -0000 1.3
@@ -104,6 +104,11 @@
txtMagicDrawPath.Text = openFileDialog1.FileName;
}
}
+
+ private void button1_Click(object sender, EventArgs e)
+ {
+ m_settings.EraseAllSettings();
+ }
}
1.2 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/ExternalToolsOptionsPage.designer.cs
Index: ExternalToolsOptionsPage.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/ExternalToolsOptionsPage.designer.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ExternalToolsOptionsPage.designer.cs 12 Jul 2006 09:15:06 -0000 1.1
+++ ExternalToolsOptionsPage.designer.cs 30 Jul 2006 05:33:25 -0000 1.2
@@ -185,7 +185,7 @@
this.groupBox1.Size = new System.Drawing.Size(395, 49);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Schema Export Project";
+ this.groupBox1.Text = ":";
//
// txtSchemaExportCommandLine
//
1.2 +13 -13 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/ExternalToolsOptionsPage.resx
Index: ExternalToolsOptionsPage.resx
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages/ExternalToolsOptionsPage.resx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ExternalToolsOptionsPage.resx 12 Jul 2006 09:15:06 -0000 1.1
+++ ExternalToolsOptionsPage.resx 30 Jul 2006 05:33:25 -0000 1.2
@@ -126,21 +126,21 @@
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABO
BAAAAk1TRnQBSQFMAwEBAAEEAQABBAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA
- ARADAAEBAQABIAYAARASAAEGAgEBBgE7AgEBYQFKAgIBiAEzAgEBTwEEAgEBBOwAAUUCAQF6AWsBdQGB
- Af8BiwGBAaMB/wFgAgMB0wE2AgEBVgEEAgEBBOgAAT0CAQFlAVMBrwL/AU8BfQHDAf8BiwGBAaMB/wFg
- AgMB0wE2AgEBVgEEAgEBBOgAAV8BNgFOAfABUwGvAv8BTgF/AcYB/wGLAYEBowH/AWACAwHTATYCAQFW
- AQQCAQEE6AABXwE2AU4B8AFTAa8C/wFOAX8BxgH/AYsBgQGjAf8BYAIDAdMBMAIBAUkEAAECAwEBAgMB
- AQIDAQECAwHYAAFfATYBTgHwAVMBrwL/AU4BfwHGAf8BiwGBAaMB/wFDAgEBdAEdAgEBJwE/AgEBaQFN
- AgIBkgFPAgIBlQFEAgEBdwEiAgEBMAEEAgEBBNQAAV8BNgFOAfABUwGvAv8DggH/AX0COQHyAbYBhQGB
+ ARADAAEBAQABIAYAARASAAEGAgEBBgE7AgEBYQFKAgIBiAEzAgEBTwEEAgEBBOwAAUUCAQF6AW0BdwGB
+ Af8BiwGBAaMB/wFgAgMB0wE2AgEBVgEEAgEBBOgAAT0CAQFlAVUBrwL/AVEBfwHDAf8BiwGBAaMB/wFg
+ AgMB0wE2AgEBVgEEAgEBBOgAAV8BKwE+AfABVQGvAv8BUAGBAcYB/wGLAYEBowH/AWACAwHTATYCAQFW
+ AQQCAQEE6AABXwErAT4B8AFVAa8C/wFQAYEBxgH/AYsBgQGjAf8BYAIDAdMBMAIBAUkEAAECAwEBAgMB
+ AQIDAQECAwHYAAFfASsBPgHwAVUBrwL/AVABgQHGAf8BiwGBAaMB/wFDAgEBdAEdAgEBJwE/AgEBaQFN
+ AgIBkgFPAgIBlQFEAgEBdwEiAgEBMAEEAgEBBNQAAV8BKwE+AfABVQGvAv8DggH/AXsCLQHyAbYBhQGB
Af8B7QHSAagC/wH6AccB/wH8AfgBzAH/AdYBtgGlAf8BXgIEAdcBPgIBAWcBBgIBAQbUAAEDAgEBAgHA
- ArYB/wHkAbQBlAL/AfUBygL/Af0BygP/AdYD/wHgA/8B6QH/AfoB9wHsAf8BZwINAeUBMgIBAU7UAAEC
+ ArYB/wHkAbQBlAL/AfUBygL/Af0BygP/AdYD/wHgA/8B6QH/AfoB9wHsAf8BZwILAeUBMgIBAU7UAAEC
AwEB0gGiAZUC/wH4Ac4C/wHpAbYD/wHOA/8B3wP/Ae8J/wHoAdsBvgH/AVMCAgGh1AABHwIBASoB/wHb
- AagC/wHnAbQC/wHqAbcD/wHQA/8B4AP/AfED/wH4A/8B6AP/AdgB/wFrAg8B6dQAAUsCAgGJAf8B7gHE
- Av8B1gGjAv8B5AGxAv8B/QHKA/8B2gP/AeQD/wHmA/8B3wP/AdEB/wGaAnEB/9QAAS0CAQFEAf8B7AG/
- Av8B3gGtAv8B7wHCAv8B9QHCAv8B/gHMA/8B1AP/AdUD/wHQAv8B+AHKAf8BbgIdAfDYAAHwAdYBsAL/
- AfwB5wL/AfIB2wL/AdsBrAL/AfMBwAL/AfABvQL/AfABvQL/AfABvQL/AeMBsAH/AVYCAgGw2AABYQIF
- AdEC/wH5Bv8B5gG7Av8B3wGvAv8B2gGnAv8B6AG1Av8B7wHFAf8BtQGEAYEB/wEYAgEBH9wAAXwCJwHw
- Af8B9wHYAv8B/AHYAv8B/AHPAv8B+wHPAv8B2wGrAf8BvwGPAYUB/wEaAgEBIuQAASQCAQEyAWoCDAHi
+ AagC/wHnAbQC/wHqAbcD/wHQA/8B4AP/AfED/wH4A/8B6AP/AdgB/wFrAg0B6dQAAUsCAgGJAf8B7gHE
+ Av8B1gGjAv8B5AGxAv8B/QHKA/8B2gP/AeQD/wHmA/8B3wP/AdEB/wGaAnMB/9QAAS0CAQFEAf8B7AG/
+ Av8B3gGtAv8B7wHCAv8B9QHCAv8B/gHMA/8B1AP/AdUD/wHQAv8B+AHKAf8BbgIYAfDYAAHwAdYBsAL/
+ AfwB5wL/AfIB2wL/AdsBrAL/AfMBwAL/AfABvQL/AfABvQL/AfABvQL/AeMBsAH/AVYCAgGw2AABYQID
+ AdEC/wH5Bv8B5gG7Av8B3wGvAv8B2gGnAv8B6AG1Av8B7wHFAf8BtQGEAYEB/wEYAgEBH9wAAXgCIQHw
+ Af8B9wHYAv8B/AHYAv8B/AHPAv8B+wHPAv8B2wGrAf8BvwGPAYUB/wEaAgEBIuQAASQCAQEyAWcCCgHi
AawCgQH/AcoClwH/AUgCAgGBAQYCAQEGyAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGA
FwAD/wEAAQcB/wYAAQMB/wYAAQEB/wYAAYAB/wYAAcABhwYAAeABAQYAAfAHAAH4BwAB+AcAAfgHAAH4
BwAB+AcAAfwHAAH8BwAB/gEBBgAB/wEDBgAL
1.2 +20 -0 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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- pom.xml 25 Jul 2006 13:09:31 -0000 1.1
+++ pom.xml 30 Jul 2006 05:33:26 -0000 1.2
@@ -89,6 +89,26 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${core.generated.dir}</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>${common.generated.dir}</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
1.3 +54 -17 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml/empty.model.xml
Index: empty.model.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml/empty.model.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- empty.model.xml 9 Jun 2006 22:27:24 -0000 1.2
+++ empty.model.xml 30 Jul 2006 05:33:26 -0000 1.3
@@ -12,14 +12,14 @@
<XMI.content>
<UML:Model xmi.id='eee_1045467100313_135436_1' name='Data' isRoot='false' isLeaf='false' isAbstract='false'>
<UML:ModelElement.comment>
- <UML:Comment xmi.id='_24400562_1092013275546_280654_0' name='Author:Administrator. Created:8/8/04 8:58 PM. Title:. Comment:. '/>
+ <UML:Comment xmi.id='_24400562_1092013275546_280654_0' name='Author:${wizard.sysinfo.currentuser}. Created:${wizard.sysinfo.currentdate}. Title:. Comment:Generated by ${wizard.android.apptitle}. '/>
</UML:ModelElement.comment>
<XMI.extension xmi.extender='MagicDraw UML 9.0' xmi.extenderID='MagicDraw UML 9.0'>
<ignoredInModule xmi.value='true'/>
</XMI.extension>
<UML:Namespace.ownedElement>
<UML:Package xmi.id='eee_1045467100313_365297_7' name='Component View' isRoot='false' isLeaf='false' isAbstract='false'/>
- <UML:Package href='andromda-profile-3.2-RC1-SNAPSHOT.xml.zip|_8a70287_1078771814628_224704_589'>
+ <UML:Package href='andromda-profile-${wizard.application.andromda.version}.xml.zip|_8a70287_1078771814628_224704_589'>
<XMI.extension xmi.extender='MagicDraw UML 9.0' xmi.extenderID='MagicDraw UML 9.0'>
<referentPath xmi.value='::org.andromda.profile'/>
</XMI.extension>
@@ -56,16 +56,54 @@
<propertyID>MODULES_DIRS</propertyID>
<propertyDescriptionID>MODULES_DIRS_DESCRIPTION</propertyDescriptionID>
<mdElement elementClass='FileProperty'>
- <value><maven1.repository>\andromda\xml.zips</value>
- <selectionMode xmi.value='0'/>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile\3.2-SNAPSHOT\</value>
+ <selectionMode xmi.value='2'/>
+ </mdElement>
+ <mdElement elementClass='FileProperty'>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-datatype\3.2-SNAPSHOT\</value>
+ <selectionMode xmi.value='2'/>
+ </mdElement>
+ <mdElement elementClass='FileProperty'>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-meta\3.2-SNAPSHOT\</value>
+ <selectionMode xmi.value='2'/>
+ </mdElement>
+ <mdElement elementClass='FileProperty'>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-persistence\3.2-SNAPSHOT\</value>
+ <selectionMode xmi.value='2'/>
+ </mdElement>
+ <mdElement elementClass='FileProperty'>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-presentation\3.2-SNAPSHOT\</value>
+ <selectionMode xmi.value='2'/>
+ </mdElement>
+ <mdElement elementClass='FileProperty'>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-process\3.2-SNAPSHOT\</value>
+ <selectionMode xmi.value='2'/>
+ </mdElement>
+ <mdElement elementClass='FileProperty'>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-service\3.2-SNAPSHOT\</value>
+ <selectionMode xmi.value='2'/>
+ </mdElement>
+ <mdElement elementClass='FileProperty'>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profiles-uml14\3.2-SNAPSHOT\</value>
+ <selectionMode xmi.value='2'/>
+ </mdElement>
+ <mdElement elementClass='FileProperty'>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-webservice\3.2-SNAPSHOT\</value>
+ <selectionMode xmi.value='2'/>
+ </mdElement>
+ <mdElement elementClass='FileProperty'>
+ <value><maven2.repository>\org\andromda\profiles\uml14\andromda-profile-xml\3.2-SNAPSHOT\</value>
+ <selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
<value><maven1.repository>\andromda\xml.zips\</value>
- <selectionMode xmi.value='0'/>
+ <selectionMode xmi.value='2'/>
</mdElement>
- <value xmi.value='false'/>
+ <value xmi.value='true'/>
</mdElement>
</mdElement>
+
+ </mdElement>
<mdElement elementClass='PropertyManager'>
<name>PROJECT_INVISIBLE_PROPERTIES</name>
<propertyManagerID>_9_0_2_12ab03bf_1125323139546_578921_3</propertyManagerID>
@@ -177,7 +215,6 @@
<index xmi.value='-1'/>
</mdElement>
</mdElement>
- </mdElement>
<favoriteElements xmi.value=''/>
</options>
<componentView>
1.3 +5 -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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- pom.xml 27 Jul 2006 03:55:48 -0000 1.2
+++ pom.xml 30 Jul 2006 05:33:26 -0000 1.3
@@ -82,6 +82,11 @@
<artifactId>andromda-maven-plugin</artifactId>
<version>${wizard.application.andromda.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
1.2 +56 -38 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/settings.xml
Index: settings.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/settings.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- settings.xml 11 Jul 2006 13:45:38 -0000 1.1
+++ settings.xml 30 Jul 2006 05:33:26 -0000 1.2
@@ -4,18 +4,18 @@
<id>andromda</id>
<repositories>
<repository>
- <id>andromda</id>
- <name>AndroMDA</name>
- <url>http://galaxy.andromda.org/maven2</url>
+ <id>ibiblio</id>
+ <name>IBiblio</name>
+ <url>http://www.ibiblio.org/maven2</url>
<layout>default</layout>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
- <id>andromda-snapshot</id>
- <name>AndroMDA</name>
- <url>http://galaxy.andromda.org/maven2</url>
+ <id>ibiblio-snapshot</id>
+ <name>IBiblio</name>
+ <url>http://www.ibiblio.org/maven2</url>
<layout>default</layout>
<snapshots>
<enabled>true</enabled>
@@ -39,9 +39,7 @@
<enabled>true</enabled>
</snapshots>
</repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
+ <repository>
<id>andromda</id>
<name>AndroMDA</name>
<url>http://galaxy.andromda.org/maven2</url>
@@ -49,8 +47,8 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
- </pluginRepository>
- <pluginRepository>
+ </repository>
+ <repository>
<id>andromda-snapshot</id>
<name>AndroMDA</name>
<url>http://galaxy.andromda.org/maven2</url>
@@ -58,7 +56,9 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
- </pluginRepository>
+ </repository>
+ </repositories>
+ <pluginRepositories>
<pluginRepository>
<id>ibiblio</id>
<name>IBiblio</name>
@@ -77,6 +77,24 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
+ <pluginRepository>
+ <id>andromda</id>
+ <name>AndroMDA</name>
+ <url>http://galaxy.andromda.org/maven2</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>andromda-snapshot</id>
+ <name>AndroMDA</name>
+ <url>http://galaxy.andromda.org/maven2</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
</pluginRepositories>
</profile>
</profiles>
1.3 +11 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.cs
Index: MDASolutionWizard.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MDASolutionWizard.cs 25 Jul 2006 13:09:33 -0000 1.2
+++ MDASolutionWizard.cs 30 Jul 2006 05:33:26 -0000 1.3
@@ -415,6 +415,17 @@
ConfigFile config = new ConfigFile();
config.Clear();
+
+ try
+ {
+ config["sysinfo.currentuser"] = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
+ }
+ catch { }
+ config["sysinfo.currentdate"] = DateTime.Now.ToLongDateString();
+
+ config["android.apptitle"] = "Android/VS v" + AndroMDA.VS80AddIn.VS80AddIn.ADD_IN_VERSION;
+ config["android.version"] = AndroMDA.VS80AddIn.VS80AddIn.ADD_IN_VERSION;
+
config["solution.name"] = VSSolutionUtils.GetSolutionName(m_applicationObject.Solution);
config["solution.path"] = VSSolutionUtils.GetSolutionPath(m_applicationObject.Solution);
1.3 +220 -208 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/WelcomeWizard.Designer.cs
Index: WelcomeWizard.Designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/WelcomeWizard.Designer.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- WelcomeWizard.Designer.cs 25 Jul 2006 13:09:33 -0000 1.2
+++ WelcomeWizard.Designer.cs 30 Jul 2006 05:33:26 -0000 1.3
@@ -36,6 +36,22 @@
System.Windows.Forms.ListViewGroup listViewGroup8 = new System.Windows.Forms.ListViewGroup("Maven 1 (optional)", System.Windows.Forms.HorizontalAlignment.Left);
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.wizard1 = new Gui.Wizard.Wizard();
+ this.pageIssues = new Gui.Wizard.WizardPage();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.lblFixDescription = new System.Windows.Forms.Label();
+ this.btnFix = new System.Windows.Forms.Button();
+ this.lblIssueDescription = new System.Windows.Forms.RichTextBox();
+ this.pnlButtonBright3d = new System.Windows.Forms.Panel();
+ this.pnlButtonDark3d = new System.Windows.Forms.Panel();
+ this.lstFailureDetails = new System.Windows.Forms.ListView();
+ this.columnHeader3 = new System.Windows.Forms.ColumnHeader();
+ this.columnHeader4 = new System.Windows.Forms.ColumnHeader();
+ this.header1 = new Gui.Wizard.Header();
+ this.pageEnvironment = new Gui.Wizard.WizardPage();
+ this.lstEnvironment = new System.Windows.Forms.ListView();
+ this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
+ this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
+ this.header6 = new Gui.Wizard.Header();
this.pageWelcome = new Gui.Wizard.WizardPage();
this.label7 = new System.Windows.Forms.Label();
this.linkLabel3 = new System.Windows.Forms.LinkLabel();
@@ -55,30 +71,15 @@
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.pageIssues = new Gui.Wizard.WizardPage();
- this.panel1 = new System.Windows.Forms.Panel();
- this.lblFixDescription = new System.Windows.Forms.Label();
- this.btnFix = new System.Windows.Forms.Button();
- this.lblIssueDescription = new System.Windows.Forms.RichTextBox();
- this.pnlButtonBright3d = new System.Windows.Forms.Panel();
- this.pnlButtonDark3d = new System.Windows.Forms.Panel();
- this.lstFailureDetails = new System.Windows.Forms.ListView();
- this.columnHeader3 = new System.Windows.Forms.ColumnHeader();
- this.columnHeader4 = new System.Windows.Forms.ColumnHeader();
- this.header1 = new Gui.Wizard.Header();
- this.pageEnvironment = new Gui.Wizard.WizardPage();
- this.lstEnvironment = new System.Windows.Forms.ListView();
- this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
- this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
- this.header6 = new Gui.Wizard.Header();
+ this.btnRetest = new System.Windows.Forms.Button();
this.wizard1.SuspendLayout();
+ this.pageIssues.SuspendLayout();
+ this.panel1.SuspendLayout();
+ this.pageEnvironment.SuspendLayout();
this.pageWelcome.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
this.pageComplete.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
- this.pageIssues.SuspendLayout();
- this.panel1.SuspendLayout();
- this.pageEnvironment.SuspendLayout();
this.SuspendLayout();
//
// imageList1
@@ -93,10 +94,10 @@
// wizard1
//
this.wizard1.ContainingForm = this;
- this.wizard1.Controls.Add(this.pageWelcome);
- this.wizard1.Controls.Add(this.pageEnvironment);
- this.wizard1.Controls.Add(this.pageComplete);
this.wizard1.Controls.Add(this.pageIssues);
+ this.wizard1.Controls.Add(this.pageComplete);
+ this.wizard1.Controls.Add(this.pageEnvironment);
+ this.wizard1.Controls.Add(this.pageWelcome);
this.wizard1.Dock = System.Windows.Forms.DockStyle.Fill;
this.wizard1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.wizard1.Location = new System.Drawing.Point(0, 0);
@@ -109,6 +110,190 @@
this.wizard1.Size = new System.Drawing.Size(525, 360);
this.wizard1.TabIndex = 0;
//
+ // pageIssues
+ //
+ this.pageIssues.Controls.Add(this.panel1);
+ this.pageIssues.Controls.Add(this.lstFailureDetails);
+ this.pageIssues.Controls.Add(this.header1);
+ this.pageIssues.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pageIssues.IsFinishPage = false;
+ this.pageIssues.Location = new System.Drawing.Point(0, 0);
+ this.pageIssues.Name = "pageIssues";
+ this.pageIssues.Size = new System.Drawing.Size(525, 312);
+ this.pageIssues.TabIndex = 8;
+ this.pageIssues.ShowFromBack += new System.EventHandler(this.pageIssues_ShowFromBack);
+ this.pageIssues.ShowFromNext += new System.EventHandler(this.pageIssues_ShowFromNext);
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.lblFixDescription);
+ this.panel1.Controls.Add(this.btnRetest);
+ this.panel1.Controls.Add(this.btnFix);
+ this.panel1.Controls.Add(this.lblIssueDescription);
+ this.panel1.Controls.Add(this.pnlButtonBright3d);
+ this.panel1.Controls.Add(this.pnlButtonDark3d);
+ this.panel1.Location = new System.Drawing.Point(3, 160);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(522, 149);
+ this.panel1.TabIndex = 31;
+ //
+ // lblFixDescription
+ //
+ this.lblFixDescription.Location = new System.Drawing.Point(165, 121);
+ this.lblFixDescription.Name = "lblFixDescription";
+ this.lblFixDescription.Size = new System.Drawing.Size(345, 28);
+ this.lblFixDescription.TabIndex = 13;
+ //
+ // btnFix
+ //
+ this.btnFix.Location = new System.Drawing.Point(84, 116);
+ this.btnFix.Name = "btnFix";
+ this.btnFix.Size = new System.Drawing.Size(75, 23);
+ this.btnFix.TabIndex = 12;
+ this.btnFix.Text = "Fix Issue";
+ this.btnFix.UseVisualStyleBackColor = true;
+ this.btnFix.Visible = false;
+ this.btnFix.Click += new System.EventHandler(this.btnFix_Click);
+ //
+ // lblIssueDescription
+ //
+ this.lblIssueDescription.BackColor = System.Drawing.SystemColors.Control;
+ this.lblIssueDescription.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.lblIssueDescription.Cursor = System.Windows.Forms.Cursors.Arrow;
+ this.lblIssueDescription.Location = new System.Drawing.Point(9, 8);
+ this.lblIssueDescription.Name = "lblIssueDe...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2006-07-30 00:47:17
|
User: cmicali
Date: 06/07/29 17:47:17
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer
AndroidVS-1.4-beta3-Setup.exe
Log:
Revision Changes Path
1.1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer/AndroidVS-1.4-beta3-Setup.exe
<<Binary file>>
|
|
From: Vance K. <va...@us...> - 2006-07-29 09:46:36
|
User: vancek
Date: 06/07/29 02:46:29
Modified: andromda-ejb3/src/site/xdoc installation.xml
andromda-ejb3/src/changes changes.xml
Log:
update installation guide
Revision Changes Path
1.4 +29 -8 cartridges/andromda-ejb3/src/site/xdoc/installation.xml
Index: installation.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/installation.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- installation.xml 5 Jul 2006 02:46:27 -0000 1.3
+++ installation.xml 29 Jul 2006 09:46:29 -0000 1.4
@@ -26,25 +26,46 @@
<p>
You need to have an instance of AndroMDA 3.2. At the time of writing this, 3.2 RC1
was released but the latest 3.2-SNAPSHOT from CVS contains updates to the project generator
- and site plugin, and is more suitable to use with the EJB3 cartridge. Follow the anonymous
+ and site plugin; this is more suitable to use with the EJB3 cartridge. Follow the anonymous
CVS access at <a href="http://sourceforge.net/cvs/?group_id=73047">AndroMDA project</a> to
- checkout the latest <b>andromda-all</b>.
+ checkout and build the latest <b>andromda-all</b> source.
</p>
</subsection>
<a name="Getting_the_Cartridge"/>
<subsection name="Getting the Cartridge">
<p>
- The first thing you need to do is checkout the latest EJB3 cartridge from
- CVS. Follow the anonymous CVS access at
+ Once you have met the requirements above, checkout the latest EJB3 cartridge from
+ CVS HEAD.
+ You have two options:
+ <ul>
+ <li>
+ <p>
+ Follow the anonymous CVS access at
<a href="http://sourceforge.net/cvs/?group_id=154568">andromdaplugins project</a>
- on SourceForge to checkout the latest <b>andromda-ejb</b> module.
+ on SourceForge to checkout the latest <b>andromda-plugins</b> module from
+ <code>HEAD</code>.
+ </p>
+ </li>
+ <li>
+ <p>
+ If you are using an IDE like Eclipse, open your CVS repository exploring perspective,
+ create a new repository with connection type (pserver), username (anonymous),
+ password(<i>blank</i>) host (andromdaplugins.cvs.sourceforge.net) and repository path
+ (/cvsroot/andromdaplugins). Once connected, expand HEAD and check out
+ <code>andromda-plugins</code>.
+ </p>
+ </li>
+ </ul>
+ Note that this will check out all cartridges and plugins
+ which are not relevant to the EJB3 cartridge, but will ease the your build process.
</p>
</subsection>
<a name="Building_the_Cartridge"/>
<subsection name="Building the Cartridge">
<p>
- Once you have checked out the andromda-ejb3 cartridge, you can simply build it by
- going to the root folder of the project and running <i>mvn</i>.
+ Once you have checked out the <code>andromda-plugins</code> project, you can simply build
+ the <b>andromda-ejb3</b> catridge in <code>andromda-plugins/cartridges/andromda-ejb3</code>
+ by running <i>mvn</i> in the latter location.
</p>
</subsection>
<a name="Building_Reports"/>
1.28 +3 -0 cartridges/andromda-ejb3/src/changes/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/changes/changes.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -w -r1.27 -r1.28
--- changes.xml 25 Jul 2006 06:42:51 -0000 1.27
+++ changes.xml 29 Jul 2006 09:46:29 -0000 1.28
@@ -276,6 +276,9 @@
hibernate extensions are supported. If set to hibernate, then hibernate specifc annotations are
rendered in appropriate locations based on the model.
</action>
+ <action dev="vancek" type="update">
+ Updated installation howto to give more accurate directions on getting and building the EJB3 cartridge.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
|
From: Chris M. <cm...@us...> - 2006-07-28 20:35:30
|
User: cmicali
Date: 06/07/26 19:11:58
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
MDASolutionManager.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Lib
AndroMDA.NHibernateSupport.dll
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
AddInUtils.cs ConfigFile.cs
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn Android VS
License.rtf Android VS Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS
Setup.nsi
Removed: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In License.rtf AndroMDA VS2005 Add-In
Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe AndroMDA VS2005 Add-In
Setup.nsi
Log:
- Renamed files to Android VS
- Updated nhibernatesupport.dll to v1.0.4.0
Revision Changes Path
1.16 +5 -5 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.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- MDASolutionManager.cs 25 Jul 2006 13:09:28 -0000 1.15
+++ MDASolutionManager.cs 27 Jul 2006 02:11:54 -0000 1.16
@@ -280,16 +280,16 @@
// Show an error message if either the core or common projects could not be found
if (m_coreProject == null || m_commonProject == null)
{
- string errorMessage = "The open solution appears to be using AndroMDA, but the ";
+ string errorMessage = "The AndroMDA configuration was loaded, but the ";
if (m_coreProject == null)
{
- errorMessage += "core ";
+ errorMessage += "core (" + m_projectProperties["maven.andromda.core.assembly.name"] + ") ";
if (m_commonProject == null) { errorMessage += "and "; }
}
- if (m_commonProject == null) { errorMessage += "common "; }
+ if (m_commonProject == null) { errorMessage += "common (" + m_projectProperties["maven.andromda.common.assembly.name"] + ") "; }
errorMessage += "project";
if (m_commonProject == null && m_coreProject == null) errorMessage += "s";
- 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.";
+ errorMessage += " could not be found in the solution.";
throw new Exception(errorMessage);
}
m_solutionSettings = new ConfigFile(solutionPath + "\\mda\\android.user.properties");
@@ -300,7 +300,7 @@
catch (Exception e)
{
m_enabled = false;
- AddInUtils.ShowWarning(e.Message);
+ AddInUtils.ShowWarning("An error occured while trying to load the AndroMDA configuration. When you fix the problem click the 'Reload MDA Config' button.\n\n" + e.Message);
}
}
}
1.5 +217 -207 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Lib/AndroMDA.NHibernateSupport.dll
<<Binary file>>
1.7 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/AddInUtils.cs
Index: AddInUtils.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/AddInUtils.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- AddInUtils.cs 25 Jul 2006 13:09:32 -0000 1.6
+++ AddInUtils.cs 27 Jul 2006 02:11:54 -0000 1.7
@@ -25,7 +25,7 @@
public static void ShowWarning(string errorMessage)
{
- System.Windows.Forms.MessageBox.Show(errorMessage, "Android/VS", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Warning);
+ System.Windows.Forms.MessageBox.Show(errorMessage, "Android/VS Warning", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Warning);
}
public static void InsertListViewItem(ListView listView, string name, string value, string groupName)
1.2 +51 -37 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/ConfigFile.cs
Index: ConfigFile.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils/ConfigFile.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ConfigFile.cs 25 Jul 2006 13:09:32 -0000 1.1
+++ ConfigFile.cs 27 Jul 2006 02:11:54 -0000 1.2
@@ -138,6 +138,8 @@
public void LoadFromFile(string filename, bool clearConfig)
{
+ try
+ {
if (clearConfig)
{
Clear();
@@ -166,6 +168,11 @@
}
m_fileName = filename;
}
+ catch (Exception e)
+ {
+ throw new Exception("Error while trying to load " + filename + ": " + e.Message, e);
+ }
+ }
public void LoadFromXML(string filename)
{
@@ -179,6 +186,8 @@
public void LoadFromXML(string filename, string namePrefixToAdd, bool clearConfig)
{
+ try
+ {
if (clearConfig)
{
Clear();
@@ -209,6 +218,11 @@
}
m_fileName = filename;
}
+ catch (Exception e)
+ {
+ throw new Exception("Error while trying to load " + filename + ": " + e.Message, e);
+ }
+ }
public void Save()
{
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
|
|
From: Eric C. <ecr...@us...> - 2006-07-28 02:58:53
|
User: ecrutchfield
Date: 06/07/27 19:58:50
Modified: andromda-cs/src/main/resources/META-INF/andromda profile.xml
Log:
Change references to POJO
Revision Changes Path
1.2 +1 -1 cartridges/andromda-cs/src/main/resources/META-INF/andromda/profile.xml
Index: profile.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/META-INF/andromda/profile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- profile.xml 8 Mar 2006 04:10:53 -0000 1.1
+++ profile.xml 28 Jul 2006 02:58:50 -0000 1.2
@@ -5,7 +5,7 @@
<elementGroup name="Stereotypes">
<element name="SERVICE">
<documentation>
- Produces POJO service classes. This includes both a service interface as well as a
+ Produces C# service classes. This includes both a service interface as well as a
service implemention.
</documentation>
<value>Service</value>
|
|
From: Eric C. <ecr...@us...> - 2006-07-28 02:58:31
|
User: ecrutchfield
Date: 06/07/27 19:58:30
Modified: andromda-cs/src/main/resources/META-INF/andromda
namespace.xml
Log:
remove references to POJO
Revision Changes Path
1.2 +2 -2 cartridges/andromda-cs/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- namespace.xml 8 Mar 2006 04:10:53 -0000 1.1
+++ namespace.xml 28 Jul 2006 02:58:30 -0000 1.2
@@ -14,12 +14,12 @@
</documentation>
<property name="services" required="false">
<documentation>
- The directory to which POJO service interfaces are generated.
+ The directory to which service interfaces are generated.
</documentation>
</property>
<property name="service-impls" required="false">
<documentation>
- The directory to which POJO service implementation classes are generated
+ The directory to which service implementation classes are generated
</documentation>
</property>
<property name="value-objects" required="false">
|
|
From: Eric C. <ecr...@us...> - 2006-07-28 02:45:46
|
User: ecrutchfield
Date: 06/07/27 19:45:44
Modified: andromda-cs pom.xml
Log:
turned on testing (cross your fingers!)
Revision Changes Path
1.5 +1 -1 cartridges/andromda-cs/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/pom.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- pom.xml 6 Jul 2006 15:20:54 -0000 1.4
+++ pom.xml 28 Jul 2006 02:45:44 -0000 1.5
@@ -66,7 +66,7 @@
</plugins>
</build>
<properties>
- <maven.test.skip>true</maven.test.skip>
+ <maven.test.skip>false</maven.test.skip>
<model.uri>file:${pom.basedir}/src/main/uml/empty-model.xmi</model.uri>
<test.model.uri>jar:file:${pom.basedir}/src/test/uml/CsCartridgeTestModel.xml.zip!/CsCartridgeTestModel.xml</test.model.uri>
</properties>
|
|
From: Eric C. <ecr...@us...> - 2006-07-28 02:39:59
|
User: ecrutchfield
Date: 06/07/27 19:39:57
Modified: andromda-cs/src/main/resources/templates/cs Enumeration.vsl
Log:
added back the support for enumerations of different types (e.g. long, int, byte).
Revision Changes Path
1.4 +4 -1 cartridges/andromda-cs/src/main/resources/templates/cs/Enumeration.vsl
Index: Enumeration.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/Enumeration.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- Enumeration.vsl 3 Jul 2006 09:30:44 -0000 1.3
+++ Enumeration.vsl 28 Jul 2006 02:39:56 -0000 1.4
@@ -1,3 +1,6 @@
+#if (!$enumeration.literalType.name.equalsIgnoreCase("int") && !$enumeration.literalType.name.equalsIgnoreCase("string"))
+#set ($enumType = $enumeration.literalType.name)
+#end
// Name: ${enumeration.name}.cs
// license-header cs merge-point
//
@@ -13,7 +16,7 @@
/// <summary>
$enumeration.getDocumentation(" /// ")
/// </summary>
- public enum $enumeration.name
+ public enum $enumeration.name#if ($stringUtils.isNotBlank($enumType)) :$enumType#end
{
#foreach ($literal in $enumeration.literals)
#if ($literal.defaultValue)
|
|
From: Eric C. <ecr...@us...> - 2006-07-28 02:37:54
|
User: ecrutchfield Date: 06/07/27 19:37:49 Modified: andromda-cs/src/test/uml CsCartridgeTestModel.xml.zip Log: Revised TestEnumeration to have a 'long' instead of 'Long' property. Revision Changes Path 1.3 +80 -77 cartridges/andromda-cs/src/test/uml/CsCartridgeTestModel.xml.zip <<Binary file>> |
|
From: Eric C. <ecr...@us...> - 2006-07-28 02:36:20
|
User: ecrutchfield Date: 06/07/27 19:36:11 Modified: andromda-cs/src/test/expected cartridge-output.zip Log: Updated expected test results Revision Changes Path 1.3 +23 -25 cartridges/andromda-cs/src/test/expected/cartridge-output.zip <<Binary file>> |
|
From: Eric C. <ecr...@us...> - 2006-07-28 02:10:09
|
User: ecrutchfield Date: 06/07/27 19:10:07 Modified: andromda-cs/src/main/resources/templates/cs ValueObject.vsl Log: fixed whitespace Revision Changes Path 1.2 +2 -2 cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl Index: ValueObject.vsl =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 |
|
From: Eric C. <ecr...@us...> - 2006-07-28 02:09:21
|
User: ecrutchfield
Date: 06/07/27 19:09:21
Modified: andromda-cs/src/main/resources/templates/cs Interface.vsl
Log:
Converted from Java to C#. Still needs to be 'turned on' in cartridge.xml.
Revision Changes Path
1.2 +48 -42 cartridges/andromda-cs/src/main/resources/templates/cs/Interface.vsl
Index: Interface.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/Interface.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- Interface.vsl 8 Mar 2006 04:10:51 -0000 1.1
+++ Interface.vsl 28 Jul 2006 02:09:21 -0000 1.2
@@ -1,35 +1,43 @@
-// license-header java merge-point
-/* Autogenerated by AndroMDA C# cartridge (Interface.vsl) - do not edit */
+// Name: ${interface.name}.cs
+// license-header cs merge-point
+//
+// Attention: Generated code! Do not modify by hand!
+// Generated by: Interface.vsl in andromda-cs-cartridge.
+
+using System;
+
#if ($stringUtils.isNotBlank($interface.packageName))
-package $interface.packageName;
+namespace $interface.packageName
+{
#end
-/**
-$interface.getDocumentation(" * ")
- */
+ /// <summary>
+$interface.getDocumentation(" /// ")
+ /// </summary>
public interface $interface.name
#if (!$interface.allGeneralizations.empty)
- extends $interface.generalizationList
+ : $interface.generalizationList
#end
{
#foreach($attribute in $interface.attributes)
#if ($attribute.visibility == "public")
#if ($attribute.static)
- /**
-$attribute.getDocumentation(" * ")
- */
- public static final $attribute.type.fullyQualifiedName $attribute.name = $attribute.defaultValue;
+ /// <summary>
+$attribute.getDocumentation(" /// ")
+ /// </summary>
+ /* C# does not support fields in an interface */
+ /*public static $attribute.type.fullyQualifiedName $attribute.name = $attribute.defaultValue;*/
#else
- /**
-$attribute.getDocumentation(" * ")
- */
- public $attribute.getterSetterTypeName ${attribute.getterName}();
-
- /**
-$attribute.getDocumentation(" * ")
- */
- public void ${attribute.setterName}($attribute.getterSetterTypeName $attribute.name);
+ /// <summary>
+$attribute.getDocumentation(" /// ")
+ /// </summary>
+ $attribute.getterSetterTypeName ${attribute.getterName}();
+
+ /// <summary>
+$attribute.getDocumentation(" /// ")
+ /// </summary>
+ void ${attribute.setterName}($attribute.getterSetterTypeName $attribute.name);
#end
#end
@@ -37,33 +45,31 @@
#foreach ($associationEnd in $interface.associationEnds)
#set ($target = $associationEnd.otherEnd)
#if ($target.navigable)
- /**
- * Get the $target.name
-$target.getDocumentation(" * ")
- */
- public $target.getterSetterTypeName ${target.getterName}();
-
- /**
- * Set the $target.name
- */
- public void ${target.setterName}($target.getterSetterTypeName $target.name);
+ /// <summary>
+ /// Get the $target.name
+$target.getDocumentation(" /// ")
+ /// </summary>
+ $target.getterSetterTypeName ${target.getterName}();
+
+ /// <summary>
+ /// Set the $target.name
+ /// </summary>
+ void ${target.setterName}($target.getterSetterTypeName $target.name);
#end
#end
#foreach ( $operation in $interface.operations)
#if ($operation.visibility == "public")
- /**
-$operation.getDocumentation(" * ")
- */
+ /// <summary>
+$operation.getDocumentation(" /// ")
+ /// </summary>
#set ($returnType = $operation.returnType.fullyQualifiedName)
-#if ($operation.exceptionsPresent)
- public $returnType $operation.signature
- throws $operation.exceptionList;
-#else
- public $returnType $operation.signature;
-#end
+ $returnType $operation.signature;
#end
#end
}
\ No newline at end of file
+#if ($stringUtils.isNotBlank($interface.packageName))
+}
+#end
|
|
From: Eric C. <ecr...@us...> - 2006-07-28 01:42:00
|
User: ecrutchfield Date: 06/07/27 18:41:28 Added: andromda-cs/src/test/expected .cvsignore Log: Revision Changes Path 1.1 cartridges/andromda-cs/src/test/expected/.cvsignore Index: .cvsignore =================================================================== org |
|
From: Chris M. <cm...@us...> - 2006-07-27 05:45:22
|
User: cmicali
Date: 06/07/26 19:08:19
Modified: etc/andromda-dotnet/AndroMDA.NHibernateSupport/src
DbSupport.cs DefaultSessionManager.cs
Log:
- Added eric's support code for the new SchemaExport
Revision Changes Path
1.2 +255 -4 plugins/etc/andromda-dotnet/AndroMDA.NHibernateSupport/src/DbSupport.cs
Index: DbSupport.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.NHibernateSupport/src/DbSupport.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- DbSupport.cs 9 Jul 2006 12:08:21 -0000 1.1
+++ DbSupport.cs 27 Jul 2006 02:08:19 -0000 1.2
@@ -1,12 +1,23 @@
// Name: DbSupport.cs
// Author: Naresh Bhatia
-
using System;
+using System.Configuration;
+using System.Data;
+using System.IO;
+using log4net;
+using NHibernate;
namespace AndroMDA.NHibernateSupport
{
- public class DbSupport
+ /// <summary>
+ /// Contains methods supporting the generation of tables based on NHibernate mappings.
+ /// </summary>
+ public class DbSupport : IDisposable
{
+ private static readonly ILog log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
+ #region Public static methods
+
/// <summary>
/// Creates ddl and/or runs it against the database.
/// </summary>
@@ -18,5 +29,245 @@
new NHibernate.Tool.hbm2ddl.SchemaExport(SessionManagerFactory.SessionManager.Config);
schemaExport.Create(script, export);
}
+
+ #endregion
+
+ #region Public instance methods
+ /// <summary>
+ /// Generates DDL for the target database to create the tables.
+ /// </summary>
+ /// <returns>An array of strings containing the DDL.</returns>
+ public string[] GenerateCreateSQL()
+ {
+ NHibernate.Dialect.Dialect dialect = NHibernate.Dialect.Dialect.GetDialect(SessionManagerFactory.SessionManager.Config.Properties);
+ string[] createSql = SessionManagerFactory.SessionManager.Config.GenerateSchemaCreationScript(dialect);
+ return createSql;
+ }
+
+ /// <summary>
+ /// Generates DDL for the target database to drop the tables.
+ /// </summary>
+ /// <returns>An array of strings containing the DDL.</returns>
+ public string[] GenerateDropSQL()
+ {
+ NHibernate.Dialect.Dialect dialect = NHibernate.Dialect.Dialect.GetDialect(SessionManagerFactory.SessionManager.Config.Properties);
+ string[] dropSql = SessionManagerFactory.SessionManager.Config.GenerateDropSchemaScript(dialect);
+ return dropSql;
+ }
+
+ /// <summary>
+ /// Regenerates the database.
+ /// </summary>
+ /// <param name="createFile">The create file.</param>
+ /// <param name="dropFile">The drop file.</param>
+ /// <returns></returns>
+ public string RegenerateDatabase(string createFile, string dropFile)
+ {
+ return RegenerateDatabase(new FileInfo(createFile), new FileInfo(dropFile));
+ }
+
+ /// <summary>
+ /// This method can be used to regenerate a database schema using NHibernate.
+ /// It can be run multiple times and can delete the old schema, even if your
+ /// mapping files have changed the schema since the last time it was run.
+ /// </summary>
+ /// <param name="createFile">The <see cref="FileInfo"/> object containing the
+ /// 'create schema' DDL commands. This file does not have to exist.</param>
+ /// <param name="dropFile">The <see cref="FileInfo"/> object containing the
+ /// previously generated 'drop schema' DDL commands. This file does not
+ /// have to exist.</param>
+ /// <returns>The DDL used to create the tables.</returns>
+ public string RegenerateDatabase(System.IO.FileInfo createFile, System.IO.FileInfo dropFile)
+ {
+ string dropScriptFileName = null;
+ string dropSQL = null;
+ bool errorWhileExporting = false;
+
+ if (createFile == null)
+ throw new ArgumentNullException("createFile", "The create FileInfo object can't be null.");
+
+ if (dropFile == null)
+ throw new ArgumentNullException("dropFile", "The drop FileInfo object can't be null.");
+
+ //read in the "Delete Statements SQL" script, if it exists.
+ if (dropFile.Exists)
+ {
+ // First, copy this to the 'old drop' file
+ string oldFile = Path.GetFileNameWithoutExtension(dropFile.Name) + "-old" + dropFile.Extension;
+ File.Copy(dropFile.FullName, oldFile, true);
+
+ // Next, read the contents of the file
+ try
+ {
+ using (System.IO.TextReader reader = dropFile.OpenText())
+ {
+ dropSQL = reader.ReadToEnd();
+ reader.Close();
+ }
+ }
+ catch (Exception ex)
+ {
+ string errMsg = "An error occurred while opening the delete script. Continuing the schema export process anyway.";
+ log.Error(errMsg, ex);
+ }
+ }
+ else
+ {
+ // Create an empty drop file since we are continuing, but we did
+ // not drop anything
+ FileStream fs = File.Create(dropFile.FullName);
+ fs.Close();
+ fs = null;
+ }
+
+ IDbConnection conn = SessionManagerFactory.SessionManager.Session.Connection;
+ string[] dropSQLArray;
+ string[] createDBArray;
+
+ using (IDbCommand command = conn.CreateCommand())
+ {
+ // Execute the SQL script to drop the current schema
+ if (dropSQL != null && dropSQL.Trim().Length > 0)
+ {
+ command.CommandText = dropSQL;
+ command.CommandType = CommandType.Text;
+
+ try
+ {
+ command.ExecuteNonQuery();
+
+ if (log.IsInfoEnabled)
+ log.Info("Dropped the current schema using the following SQL:" + Environment.NewLine + dropSQL);
+ }
+ catch (Exception ex)
+ {
+ log.Error("An error occured while trying to drop the existing database schema.", ex);
+ throw;
+ }
+ }
+
+ // Now generate the 'drop sql' script for the new database schema
+ dropSQLArray = GenerateDropSQL();
+
+ // Now generate the 'create sql' script for the new database schema
+ createDBArray = GenerateCreateSQL();
+
+ // Run the create SQL code
+ SessionManagerFactory.SessionManager.BeginTransaction();
+ foreach (string sql in createDBArray)
+ {
+ command.CommandText = sql;
+ command.CommandType = CommandType.Text;
+ SessionManagerFactory.SessionManager.Session.Transaction.Enlist(command);
+ try
+ {
+ command.ExecuteNonQuery();
+ }
+ catch (Exception ex)
+ {
+ errorWhileExporting = true;
+ log.Error("An error occured while running the create script.", ex);
+ }
+ }
+
+ if (errorWhileExporting)
+ SessionManagerFactory.SessionManager.RollbackTransaction();
+ else
+ SessionManagerFactory.SessionManager.CommitTransaction();
+
+ }
+
+ // Save the create script
+ try
+ {
+ if (createFile.Exists)
+ {
+ createFile.Delete();
+ createFile.Refresh();
+ }
+ using (StreamWriter sw = createFile.CreateText())
+ {
+ foreach (string sql in createDBArray)
+ {
+ sw.WriteLine(sql);
+ }
+ sw.Close();
+ }
+ }
+ catch (Exception ex)
+ {
+ log.Error(String.Format("A problem occurred while creating the {0} file containing the CREATE DDL.", createFile.FullName), ex);
+ }
+
+ // Save the delete script so we can use it the next time
+ try
+ {
+ //If we had errors while creating the
+ //schema, then save the new 'drop schema' sql script to a new file
+ if (errorWhileExporting && dropFile != null)
+ {
+ //otherwise, save the old 'Delete' script and create the delete script with a new name.
+ dropScriptFileName = System.IO.Path.GetFileNameWithoutExtension(dropFile.FullName) + ".failure" + dropFile.Extension;
+ }
+ else
+ dropScriptFileName = dropFile.FullName;
+
+ // Remove the reference to the dropFile
+ dropFile = null;
+
+ using (System.IO.StreamWriter writer = File.CreateText(dropScriptFileName))
+ {
+ foreach (string sqlLine in dropSQLArray)
+ {
+ writer.WriteLine(sqlLine);
+ }
+ }
+ log.Info(String.Format("The delete DDL was written to {0}", dropScriptFileName));
+
+ if (errorWhileExporting)
+ {
+ throw new ApplicationException("There were errors while exporting the schema to the database. Please review the log for more detailed error information.");
+ }
+ }
+ catch (Exception ex)
+ {
+ string msg = "Unable to create the '{0}' "+
+ "removal script. This means that, if the schema changes the next time you "+
+ "run SchemaExport, it's likely we won't be able to remove the existing tables " +
+ "because not all the constraints will be removed.";
+ log.Error(String.Format(msg, dropScriptFileName), ex);
+ throw new ApplicationException(String.Format(msg, dropScriptFileName), ex);
+ }
+
+ return String.Join(Environment.NewLine, createDBArray);
+
+ }
+
+ #endregion
+
+ #region Constructor
+
+ public DbSupport()
+ {
+ log4net.Config.XmlConfigurator.Configure();
+
+ // Start NHibernate
+ SessionManagerFactory.SessionManager.HandleApplicationStart();
+ SessionManagerFactory.SessionManager.HandleSessionStart();
+ }
+
+ #endregion
+
+ #region IDisposable Members
+
+ public void Dispose()
+ {
+ //Stop NHibernate
+ SessionManagerFactory.SessionManager.HandleSessionEnd();
+ SessionManagerFactory.SessionManager.HandleApplicationEnd();
+ }
+
+ #endregion
+
}
}
\ No newline at end of file
1.2 +4 -9 plugins/etc/andromda-dotnet/AndroMDA.NHibernateSupport/src/DefaultSessionManager.cs
Index: DefaultSessionManager.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.NHibernateSupport/src/DefaultSessionManager.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- DefaultSessionManager.cs 9 Jul 2006 12:08:21 -0000 1.1
+++ DefaultSessionManager.cs 27 Jul 2006 02:08:19 -0000 1.2
@@ -190,12 +190,7 @@
// will attempt to be initialized if it is null
if (SessionFactory == null)
{
- throw new Exception("The nhibernate session factory has not been initialized.");
- }
-
- if (GetSession() != null)
- {
- throw new Exception("A Session already exists.");
+ throw new Exception("SessionStart was called but the nhibernate session factory has not been initialized.");
}
if (!isSessionInitializedLazily)
{
@@ -206,14 +201,14 @@
public void HandleSessionEnd()
{
if (GetTransaction() != null)
- throw new Exception("A transaction still exists.");
+ throw new Exception("SessionEnd was called but a transaction still exists.");
CloseSession();
}
public void BeginTransaction()
{
if (GetTransaction() != null)
- throw new Exception("A transaction already exists.");
+ throw new Exception("BeginTransaction was called but a transaction already exists.");
ITransaction transaction = Session.BeginTransaction();
SetTransaction(transaction);
@@ -253,7 +248,7 @@
}
catch (Exception e)
{
- throw new Exception("An error occured while attempting to load nhibernate.cfg", e);
+ throw new Exception("An error occured while attempting to load nhibernate.config", e);
}
}
else if (SettingExists("hibernate.dialect", nhibernateConfig))
|
|
From: Chris M. <cm...@us...> - 2006-07-27 05:45:11
|
User: cmicali
Date: 06/07/26 20:55:48
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership
MembershipServiceImpl.cs UserDaoImpl.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
pom.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards
MDASolutionWizard.designer.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS
Setup.nsi
Log:
- Reverted m2 solution wizard output to use v1.0-SNAPSHOT of the .NET cartridges
- Fixed some alignment issues on the MDASolutionWizard
- Fixed errors in the NSIS installer script
Revision Changes Path
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/MembershipServiceImpl.cs
Index: MembershipServiceImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/MembershipServiceImpl.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MembershipServiceImpl.cs 25 Jul 2006 13:09:31 -0000 1.2
+++ MembershipServiceImpl.cs 27 Jul 2006 03:55:47 -0000 1.3
@@ -152,7 +152,7 @@
UserRole role = RoleIsInList(entity.Roles, rolestring);
if (role == null)
{
- role = UserRole.Factory.NewInstance();
+ role = UserRole.Factory.newInstance();
role.Role = (Role)Enum.Parse(typeof(Role), rolestring);
role.User = entity;
entity.Roles.Add(role);
1.3 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/UserDaoImpl.cs
Index: UserDaoImpl.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership/UserDaoImpl.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- UserDaoImpl.cs 25 Jul 2006 13:09:31 -0000 1.2
+++ UserDaoImpl.cs 27 Jul 2006 03:55:47 -0000 1.3
@@ -46,7 +46,7 @@
{
if (userVO == null) { return null; }
// VO to entity conversion
- User entity = User.Factory.NewInstance();
+ User entity = User.Factory.newInstance();
entity.Id = userVO.Id;
entity.UserName = userVO.UserName;
1.2 +3 -3 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/pom.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- pom.xml 25 Jul 2006 13:09:34 -0000 1.1
+++ pom.xml 27 Jul 2006 03:55:48 -0000 1.2
@@ -41,17 +41,17 @@
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-nspring-cartridge</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-nhibernate-cartridge</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-cs-cartridge</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
1.3 +739 -739 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.designer.cs
Index: MDASolutionWizard.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.designer.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- MDASolutionWizard.designer.cs 25 Jul 2006 13:09:33 -0000 1.2
+++ MDASolutionWizard.designer.cs 27 Jul 2006 03:55:48 -0000 1.3
@@ -32,6 +32,38 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MDASolutionWizard));
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.wizard1 = new Gui.Wizard.Wizard();
+ this.wizardPageComplete = new Gui.Wizard.WizardPage();
+ this.lnkViewLog = new System.Windows.Forms.LinkLabel();
+ this.lblFinishPageTitle = new System.Windows.Forms.Label();
+ this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
+ this.lblFinishPageDescription = new System.Windows.Forms.Label();
+ this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
+ this.txtErrorMessage = new System.Windows.Forms.TextBox();
+ this.lstLog = new System.Windows.Forms.ListBox();
+ this.wizardPageProcessing = new Gui.Wizard.WizardPage();
+ this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
+ this.lstStatus = new System.Windows.Forms.ListBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.header5 = new Gui.Wizard.Header();
+ this.wizardPageConfirmChoices = new Gui.Wizard.WizardPage();
+ this.lstChoiceOverview = new System.Windows.Forms.ListView();
+ this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
+ this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
+ this.header4 = new Gui.Wizard.Header();
+ this.wizardPageWebCommonProject = new Gui.Wizard.WizardPage();
+ this.lblMembershipSelectedImage = new System.Windows.Forms.Label();
+ this.lblMembershipSelected = new System.Windows.Forms.Label();
+ this.cbConfigureWebCommonProject = new System.Windows.Forms.CheckBox();
+ this.usrWebCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
+ this.header8 = new Gui.Wizard.Header();
+ this.wizardPageWebProject = new Gui.Wizard.WizardPage();
+ this.cbConfigureWebProject = new System.Windows.Forms.CheckBox();
+ this.usrWebProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
+ this.lblStoreSettingsInNHibernateConfigDescription = new System.Windows.Forms.Label();
+ this.lblAddMembershipSupportText = new System.Windows.Forms.Label();
+ this.cbUseNHibernateConfig = new System.Windows.Forms.CheckBox();
+ this.cbAddMembershipSupport = new System.Windows.Forms.CheckBox();
+ this.header7 = new Gui.Wizard.Header();
this.wizardPageUnitTestingProject = new Gui.Wizard.WizardPage();
this.cbConfigureUnitTestingProject = new System.Windows.Forms.CheckBox();
this.usrTestProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
@@ -72,39 +104,14 @@
this.label2 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
- this.wizardPageComplete = new Gui.Wizard.WizardPage();
- this.lnkViewLog = new System.Windows.Forms.LinkLabel();
- this.lblFinishPageTitle = new System.Windows.Forms.Label();
- this.pictureBoxComplete = new System.Windows.Forms.PictureBox();
- this.lblFinishPageDescription = new System.Windows.Forms.Label();
- this.lblFinishPageTitleImage = new System.Windows.Forms.Label();
- this.txtErrorMessage = new System.Windows.Forms.TextBox();
- this.lstLog = new System.Windows.Forms.ListBox();
- this.wizardPageProcessing = new Gui.Wizard.WizardPage();
- this.pictureBoxThrobber = new System.Windows.Forms.PictureBox();
- this.lstStatus = new System.Windows.Forms.ListBox();
- this.label7 = new System.Windows.Forms.Label();
- this.header5 = new Gui.Wizard.Header();
- this.wizardPageConfirmChoices = new Gui.Wizard.WizardPage();
- this.lstChoiceOverview = new System.Windows.Forms.ListView();
- this.columnHeader1 = new System.Windows.Forms.ColumnHeader();
- this.columnHeader2 = new System.Windows.Forms.ColumnHeader();
- this.header4 = new Gui.Wizard.Header();
- this.wizardPageWebCommonProject = new Gui.Wizard.WizardPage();
- this.lblMembershipSelectedImage = new System.Windows.Forms.Label();
- this.lblMembershipSelected = new System.Windows.Forms.Label();
- this.cbConfigureWebCommonProject = new System.Windows.Forms.CheckBox();
- this.usrWebCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
- this.header8 = new Gui.Wizard.Header();
- this.wizardPageWebProject = new Gui.Wizard.WizardPage();
- this.cbConfigureWebProject = new System.Windows.Forms.CheckBox();
- this.usrWebProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
- this.lblStoreSettingsInNHibernateConfigDescription = new System.Windows.Forms.Label();
- this.lblAddMembershipSupportText = new System.Windows.Forms.Label();
- this.cbUseNHibernateConfig = new System.Windows.Forms.CheckBox();
- this.cbAddMembershipSupport = new System.Windows.Forms.CheckBox();
- this.header7 = new Gui.Wizard.Header();
this.wizard1.SuspendLayout();
+ this.wizardPageComplete.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
+ this.wizardPageProcessing.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
+ this.wizardPageConfirmChoices.SuspendLayout();
+ this.wizardPageWebCommonProject.SuspendLayout();
+ this.wizardPageWebProject.SuspendLayout();
this.wizardPageUnitTestingProject.SuspendLayout();
this.wizardPageSchemaExportProject.SuspendLayout();
this.wizardPageCoreProject.SuspendLayout();
@@ -113,13 +120,6 @@
this.wizardPageSolutionInfo.SuspendLayout();
this.wizardPageWelcome.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
- this.wizardPageComplete.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
- this.wizardPageProcessing.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxThrobber)).BeginInit();
- this.wizardPageConfirmChoices.SuspendLayout();
- this.wizardPageWebCommonProject.SuspendLayout();
- this.wizardPageWebProject.SuspendLayout();
this.SuspendLayout();
//
// imageList1
@@ -165,834 +165,834 @@
this.wizard1.TabIndex = 0;
this.wizard1.Load += new System.EventHandler(this.wizard1_Load);
//
- // wizardPageUnitTestingProject
- //
- this.wizardPageUnitTestingProject.Controls.Add(this.cbConfigureUnitTestingProject);
- this.wizardPageUnitTestingProject.Controls.Add(this.usrTestProject);
- this.wizardPageUnitTestingProject.Controls.Add(this.header10);
- this.wizardPageUnitTestingProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageUnitTestingProject.IsFinishPage = false;
- this.wizardPageUnitTestingProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageUnitTestingProject.Name = "wizardPageUnitTestingProject";
- this.wizardPageUnitTestingProject.Size = new System.Drawing.Size(525, 312);
- this.wizardPageUnitTestingProject.TabIndex = 12;
- //
- // cbConfigureUnitTestingProject
+ // wizardPageComplete
//
- this.cbConfigureUnitTestingProject.AutoSize = true;
- this.cbConfigureUnitTestingProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbConfigureUnitTestingProject.Location = new System.Drawing.Point(12, 80);
- this.cbConfigureUnitTestingProject.Name = "cbConfigureUnitTestingProject";
- this.cbConfigureUnitTestingProject.Size = new System.Drawing.Size(192, 17);
- this.cbConfigureUnitTestingProject.TabIndex = 0;
- this.cbConfigureUnitTestingProject.Text = "Configure unit testing project";
- this.cbConfigureUnitTestingProject.UseVisualStyleBackColor = true;
- this.cbConfigureUnitTestingProject.CheckedChanged += new System.EventHandler(this.cbConfigureUnitTestingProject_CheckedChanged);
+ this.wizardPageComplete.BackColor = System.Drawing.Color.White;
+ this.wizardPageComplete.Controls.Add(this.lnkViewLog);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle);
+ this.wizardPageComplete.Controls.Add(this.pictureBoxComplete);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage);
+ this.wizardPageComplete.Controls.Add(this.txtErrorMessage);
+ this.wizardPageComplete.Controls.Add(this.lstLog);
+ this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageComplete.IsFinishPage = true;
+ this.wizardPageComplete.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageComplete.Name = "wizardPageComplete";
+ this.wizardPageComplete.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageComplete.TabIndex = 7;
+ this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
//
- // usrTestProject
+ // lnkViewLog
//
- this.usrTestProject.Location = new System.Drawing.Point(30, 102);
- this.usrTestProject.Name = "usrTestProject";
- this.usrTestProject.ProjectName = "";
- this.usrTestProject.Size = new System.Drawing.Size(416, 93);
- this.usrTestProject.TabIndex = 1;
+ this.lnkViewLog.AutoSize = true;
+ this.lnkViewLog.Location = new System.Drawing.Point(210, 111);
+ this.lnkViewLog.Name = "lnkViewLog";
+ this.lnkViewLog.Size = new System.Drawing.Size(49, 13);
+ this.lnkViewLog.TabIndex = 16;
+ this.lnkViewLog.TabStop = true;
+ this.lnkViewLog.Text = "View Log";
+ this.lnkViewLog.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
- // header10
+ // lblFinishPageTitle
//
- this.header10.BackColor = System.Drawing.SystemColors.Control;
- this.header10.CausesValidation = false;
- this.header10.Description = "You can have this wizard create or configure a project to contain unit tests for " +
- "your business layer.";
- this.header10.Dock = System.Windows.Forms.DockStyle.Top;
- this.header10.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header10.Location = new System.Drawing.Point(0, 0);
- this.header10.Name = "header10";
- this.header10.Size = new System.Drawing.Size(525, 65);
- this.header10.TabIndex = 5;
- this.header10.Title = "Testing Project";
+ this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblFinishPageTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblFinishPageTitle.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+ this.lblFinishPageTitle.Location = new System.Drawing.Point(209, 9);
+ this.lblFinishPageTitle.Name = "lblFinishPageTitle";
+ this.lblFinishPageTitle.Size = new System.Drawing.Size(299, 36);
+ this.lblFinishPageTitle.TabIndex = 15;
+ this.lblFinishPageTitle.Text = "Solution Update Complete";
+ this.lblFinishPageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
- // wizardPageSchemaExportProject
+ // pictureBoxComplete
//
- this.wizardPageSchemaExportProject.Controls.Add(this.cbCreateSchemaExport);
- this.wizardPageSchemaExportProject.Controls.Add(this.txtSchemaExportProject);
- this.wizardPageSchemaExportProject.Controls.Add(this.lblDescription);
- this.wizardPageSchemaExportProject.Controls.Add(this.header3);
- this.wizardPageSchemaExportProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageSchemaExportProject.IsFinishPage = false;
- this.wizardPageSchemaExportProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageSchemaExportProject.Name = "wizardPageSchemaExportProject";
- this.wizardPageSchemaExportProject.Size = new System.Drawing.Size(525, 312);
- this.wizardPageSchemaExportProject.TabIndex = 4;
- this.wizardPageSchemaExportProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSchemaExportProject_CloseFromNext);
- this.wizardPageSchemaExportProject.ShowFromBack += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext);
- this.wizardPageSchemaExportProject.ShowFromNext += new System.EventHandler(this.wizardPageSchemaExportProject_ShowFromNext);
+ this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pictureBoxComplete.Image = global::AndroMDA.VS80AddIn.Resource1.orange;
+ this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxComplete.Name = "pictureBoxComplete";
+ this.pictureBoxComplete.Size = new System.Drawing.Size(164, 312);
+ this.pictureBoxComplete.TabIndex = 13;
+ this.pictureBoxComplete.TabStop = false;
//
- // cbCreateSchemaExport
+ // lblFinishPageDescription
//
- this.cbCreateSchemaExport.AutoSize = true;
- this.cbCreateSchemaExport.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbCreateSchemaExport.Location = new System.Drawing.Point(12, 80);
- this.cbCreateSchemaExport.Name = "cbCreateSchemaExport";
- this.cbCreateSchemaExport.Size = new System.Drawing.Size(196, 17);
- this.cbCreateSchemaExport.TabIndex = 0;
- this.cbCreateSchemaExport.Text = "Create schema export project";
- this.cbCreateSchemaExport.UseVisualStyleBackColor = true;
- this.cbCreateSchemaExport.CheckedChanged += new System.EventHandler(this.cbCreateSchemaExport_CheckedChanged);
+ this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49);
+ this.lblFinishPageDescription.Name = "lblFinishPageDescription";
+ this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 62);
+ this.lblFinishPageDescription.TabIndex = 12;
+ this.lblFinishPageDescription.Text = "Your solution has been updated successfully and now supports AndroMDA code genera" +
+ "tion. You can now add classes to the solution model file and generate code base" +
+ "d on the model.\r\n";
//
- // txtSchemaExportProject
+ // lblFinishPageTitleImage
//
- this.txtSchemaExportProject.Enabled = false;
- this.txtSchemaExportProject.Location = new System.Drawing.Point(30, 102);
- this.txtSchemaExportProject.Name = "txtSchemaExportProject";
- this.txtSchemaExportProject.Size = new System.Drawing.Size(394, 21);
- this.txtSchemaExportProject.TabIndex = 1;
- this.txtSchemaExportProject.Text = "SchemaExport";
+ this.lblFinishPageTitleImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblFinishPageTitleImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblFinishPageTitleImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+ this.lblFinishPageTitleImage.ImageIndex = 0;
+ this.lblFinishPageTitleImage.ImageList = this.imageList1;
+ this.lblFinishPageTitleImage.Location = new System.Drawing.Point(170, 9);
+ this.lblFinishPageTitleImage.Name = "lblFinishPageTitleImage";
+ this.lblFinishPageTitleImage.Size = new System.Drawing.Size(49, 36);
+ this.lblFinishPageTitleImage.TabIndex = 11;
+ this.lblFinishPageTitleImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
- // lblDescription
+ // txtErrorMessage
//
- this.lblDescription.Location = new System.Drawing.Point(13, 92);
- this.lblDescription.Name = "lblDescription";
- this.lblDescription.Size = new System.Drawing.Size(507, 26);
- this.lblDescription.TabIndex = 24;
+ this.txtErrorMessage.BackColor = System.Drawing.Color.White;
+ this.txtErrorMessage.Location = new System.Drawing.Point(174, 49);
+ this.txtErrorMessage.Multiline = true;
+ this.txtErrorMessage.Name = "txtErrorMessage";
+ this.txtErrorMessage.ReadOnly = true;
+ this.txtErrorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+ this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
+ this.txtErrorMessage.TabIndex = 14;
//
- // header3
+ // lstLog
//
- this.header3.BackColor = System.Drawing.SystemColors.Control;
- this.header3.CausesValidation = false;
- this.header3.Description = "Check the box below if you would like to create a project that contains a console" +
- " application that generates database schema from your model. ";
- this.header3.Dock = System.Windows.Forms.DockStyle.Top;
- this.header3.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header3.Location = new System.Drawing.Point(0, 0);
- this.header3.Name = "header3";
- this.header3.Size = new System.Drawing.Size(525, 65);
- this.header3.TabIndex = 4;
- this.header3.Title = "Schema Export Project";
+ this.lstLog.FormattingEnabled = true;
+ this.lstLog.HorizontalScrollbar = true;
+ this.lstLog.Location = new System.Drawing.Point(174, 49);
+ this.lstLog.Name = "lstLog";
+ this.lstLog.Size = new System.Drawing.Size(339, 251);
+ this.lstLog.TabIndex = 17;
+ this.lstLog.Visible = false;
//
- // wizardPageCoreProject
+ // wizardPageProcessing
//
- this.wizardPageCoreProject.Controls.Add(this.header2);
- this.wizardPageCoreProject.Controls.Add(this.usrCoreProject);
- this.wizardPageCoreProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageCoreProject.IsFinishPage = false;
- this.wizardPageCoreProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageCoreProject.Name = "wizardPageCoreProject";
- this.wizardPageCoreProject.Size = new System.Drawing.Size(525, 312);
- this.wizardPageCoreProject.TabIndex = 3;
- this.wizardPageCoreProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCoreProject_CloseFromNext);
- this.wizardPageCoreProject.ShowFromNext += new System.EventHandler(this.wizardPageCoreProject_ShowFromNext);
+ this.wizardPageProcessing.Controls.Add(this.pictureBoxThrobber);
+ this.wizardPageProcessing.Controls.Add(this.lstStatus);
+ this.wizardPageProcessing.Controls.Add(this.label7);
+ this.wizardPageProcessing.Controls.Add(this.header5);
+ this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageProcessing.IsFinishPage = false;
+ this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageProcessing.Name = "wizardPageProcessing";
+ this.wizardPageProcessing.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageProcessing.TabIndex = 6;
+ this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
//
- // header2
+ // pictureBoxThrobber
//
- this.header2.BackColor = System.Drawing.SystemColors.Control;
- this.header2.CausesValidation = false;
- this.header2.Description = "The core project, also known as the domain project, contains all entities and dat" +
- "a access objects generated from your model.";
- this.header2.Dock = System.Windows.Forms.DockStyle.Top;
- this.header2.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header2.Location = new System.Drawing.Point(0, 0);
- this.header2.Name = "header2";
- this.header2.Size = new System.Drawing.Size(525, 65);
- this.header2.TabIndex = 3;
- this.header2.Title = "Core Project";
+ this.pictureBoxThrobber.BackColor = System.Drawing.Color.Transparent;
+ this.pictureBoxThrobber.Image = global::AndroMDA.VS80AddIn.Resource1.indicator_arrows;
+ this.pictureBoxThrobber.Location = new System.Drawing.Point(227, 77);
+ this.pictureBoxThrobber.Name = "pictureBoxThrobber";
+ this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 17);
+ this.pictureBoxThrobber.TabIndex = 10;
+ this.pictureBoxThrobber.TabStop = false;
//
- // usrCoreProject
+ // lstStatus
//
- this.usrCoreProject.Location = new System.Drawing.Point(12, 79);
- this.usrCoreProject.Name = "usrCoreProject";
- this.usrCoreProject.ProjectName = "";
- this.usrCoreProject.Size = new System.Drawing.Size(462, 100);
- this.usrCoreProject.TabIndex = 0;
+ this.lstStatus.FormattingEnabled = true;
+ this.lstStatus.Location = new System.Drawing.Point(12, 100);
+ this.lstStatus.Name = "lstStatus";
+ this.lstStatus.Size = new System.Drawing.Size(501, 199);
+ this.lstStatus.TabIndex = 9;
//
- // wizardPageCommonProject
+ // label7
//
- this.wizardPageCommonProject.Controls.Add(this.usrCommonProject);
- this.wizardPageCommonProject.Controls.Add(this.header1);
- this.wizardPageCommonProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageCommonProject.IsFinishPage = false;
- this.wizardPageCommonProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageCommonProject.Name = "wizardPageCommonProject";
- this.wizardPageCommonProject.Size = new System.Drawing.Size(525, 312);
- this.wizardPageCommonProject.TabIndex = 2;
- this.wizardPageCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageCommonProject_CloseFromNext);
- this.wizardPageCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageCommonProject_ShowFromNext);
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(12, 77);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(209, 13);
+ this.label7.TabIndex = 8;
+ this.label7.Text = "Updating solution to support AndroMDA...";
//
- // usrCommonProject
+ // header5
//
- this.usrCommonProject.Location = new System.Drawing.Point(12, 79);
- this.usrCommonProject.Name = "usrCommonProject";
- this.usrCommonProject.ProjectName = "";
- this.usrCommonProject.Size = new System.Drawing.Size(446, 98);
- this.usrCommonProject.TabIndex = 0;
+ this.header5.BackColor = System.Drawing.SystemColors.Control;
+ this.header5.CausesValidation = false;
+ this.header5.Description = "Please wait...";
+ this.header5.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header5.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
+ this.header5.Location = new System.Drawing.Point(0, 0);
+ this.header5.Name = "header5";
+ this.header5.Size = new System.Drawing.Size(525, 65);
+ this.header5.TabIndex = 6;
+ this.header5.Title = "Processing Solution";
//
- // header1
+ // wizardPageConfirmChoices
//
- this.header1.BackColor = System.Drawing.SystemColors.Control;
- this.header1.CausesValidation = false;
- this.header1.Description = "The common project contains value objects, enumerations, and other non-entity cla" +
- "sses that are generated from your model.";
- this.header1.Dock = System.Windows.Forms.DockStyle.Top;
- this.header1.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header1.Location = new System.Drawing.Point(0, 0);
- this.header1.Name = "header1";
- this.header1.Size = new System.Drawing.Size(525, 65);
- this.header1.TabIndex = 0;
- this.header1.Title = "Common Project";
+ this.wizardPageConfirmChoices.Controls.Add(this.lstChoiceOverview);
+ this.wizardPageConfirmChoices.Controls.Add(this.header4);
+ this.wizardPageConfirmChoices.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageConfirmChoices.IsFinishPage = false;
+ this.wizardPageConfirmChoices.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageConfirmChoices.Name = "wizardPageConfirmChoices";
+ this.wizardPageConfirmChoices.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageConfirmChoices.TabIndex = 5;
+ this.wizardPageConfirmChoices.ShowFromNext += new System.EventHandler(this.wizardPageConfirmChoices_ShowFromNext);
//
- // wizardPageAdvancedSettings
+ // lstChoiceOverview
//
- this.wizardPageAdvancedSettings.Controls.Add(this.txtAndroMDAVersion);
- this.wizardPageAdvancedSettings.Controls.Add(this.lblUseZippedModel);
- this.wizardPageAdvancedSettings.Controls.Add(this.label6);
- this.wizardPageAdvancedSettings.Controls.Add(this.ddlAndroMDABootstrap);
- this.wizardPageAdvancedSettings.Controls.Add(this.label5);
- this.wizardPageAdvancedSettings.Controls.Add(this.lblUseZippedModelDescription);
- this.wizardPageAdvancedSettings.Controls.Add(this.cbUseZippedModel);
- this.wizardPageAdvancedSettings.Controls.Add(this.header9);
- this.wizardPageAdvancedSettings.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageAdvancedSettings.IsFinishPage = false;
- this.wizardPageAdvancedSettings.Location = new System.Drawing.Point(0, 0);
- this.wizardPageAdvancedSettings.Name = "wizardPageAdvancedSettings";
- this.wizardPageAdvancedSettings.Size = new System.Drawing.Size(525, 312);
- this.wizardPageAdvancedSettings.TabIndex = 11;
- this.wizardPageAdvancedSettings.ShowFromBack += new System.EventHandler(this.wizardPageAdvancedSettings_ShowFromBack);
- this.wizardPageAdvancedSettings.ShowFromNext += new System.EventHandler(this.wizardPageAdvancedSettings_ShowFromNext);
+ this.lstChoiceOverview.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.columnHeader1,
+ this.columnHeader2});
+ this.lstChoiceOverview.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+ this.lstChoiceOverview.Location = new System.Drawing.Point(12, 71);
+ this.lstChoiceOverview.Name = "lstChoiceOverview";
+ this.lstChoiceOverview.Size = new System.Drawing.Size(501, 228);
+ this.lstChoiceOverview.TabIndex = 6;
+ this.lstChoiceOverview.UseCompatibleStateImageBehavior = false;
+ this.lstChoiceOverview.View = System.Windows.Forms.View.Details;
//
- // txtAndroMDAVersion
+ // columnHeader1
//
- this.txtAndroMDAVersion.BackColor = System.Drawing.SystemColors.Window;
- this.txtAndroMDAVersion.Location = new System.Drawing.Point(30, 151);
- this.txtAndroMDAVersion.Name = "txtAndroMDAVersion";
- this.txtAndroMDAVersion.Size = new System.Drawing.Size(394, 21);
- this.txtAndroMDAVersion.TabIndex = 1;
- this.txtAndroMDAVersion.Text = "3.2-SNAPSHOT";
+ this.columnHeader1.Text = "Feature";
+ this.columnHeader1.Width = 236;
//
- // lblUseZippedModel
+ // columnHeader2
//
- this.lblUseZippedModel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblUseZippedModel.Location = new System.Drawing.Point(9, 181);
- this.lblUseZippedModel.Name = "lblUseZippedModel";
- this.lblUseZippedModel.Size = new System.Drawing.Size(507, 16);
- this.lblUseZippedModel.TabIndex = 32;
- this.lblUseZippedModel.Text = "Do you want to use a zipped model file?";
+ this.columnHeader2.Text = "Value";
+ this.columnHeader2.Width = 235;
//
- // label6
+ // header4
//
- this.label6.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label6.Location = new System.Drawing.Point(9, 130);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(507, 16);
- this.label6.TabIndex = 32;
- this.label6.Text = "What version of AndroMDA should your project use?";
+ this.header4.BackColor = System.Drawing.SystemColors.Control;
+ this.header4.CausesValidation = false;
+ this.header4.Description = "Please confirm the choices you have selected. Click Next to begin processing you" +
+ "r solution.";
+ this.header4.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header4.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
+ this.header4.Location = new System.Drawing.Point(0, 0);
+ this.header4.Name = "header4";
+ this.header4.Size = new System.Drawing.Size(525, 65);
+ this.header4.TabIndex = 5;
+ this.header4.Title = "Confirm Choices";
//
- // ddlAndroMDABootstrap
+ // wizardPageWebCommonProject
//
- this.ddlAndroMDABootstrap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.ddlAndroMDABootstrap.FormattingEnabled = true;
- this.ddlAndroMDABootstrap.Items.AddRange(new object[] {
- "Apache Maven 2.x",
- "Apache Maven 1.x"});
- this.ddlAndroMDABootstrap.Location = new System.Drawing.Point(30, 102);
- this.ddlAndroMDABootstrap.Name = "ddlAndroMDABootstrap";
- this.ddlAndroMDABootstrap.Size = new System.Drawing.Size(394, 21);
- this.ddlAndroMDABootstrap.TabIndex = 0;
- this.ddlAndroMDABootstrap.SelectedIndexChanged += new System.EventHandler(this.ddlAndroMDABootstrap_SelectedIndexChanged);
+ this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelectedImage);
+ this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelected);
+ this.wizardPageWebCommonProject.Controls.Add(this.cbConfigureWebCommonProject);
+ this.wizardPageWebCommonProject.Controls.Add(this.usrWebCommonProject);
+ this.wizardPageWebCommonProject.Controls.Add(this.header8);
+ this.wizardPageWebCommonProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageWebCommonProject.IsFinishPage = false;
+ this.wizardPageWebCommonProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageWebCommonProject.Name = "wizardPageWebCommonProject";
+ this.wizardPageWebCommonProject.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageWebCommonProject.TabIndex = 10;
+ this.wizardPageWebCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebCommonProject_CloseFromNext);
+ this.wizardPageWebCommonProject.ShowFromBack += new System.EventHandler(this.wizardPageWebCommonProject_ShowFromBack);
+ this.wizardPageWebCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageWebCommonProject_ShowFromNext);
//
- // label5
+ // lblMembershipSelectedImage
//
- this.label5.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label5.Location = new System.Drawing.Point(9, 81);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(507, 16);
- this.label5.TabIndex = 30;
- this.label5.Text = "Which program should your project use to launch AndroMDA?";
+ this.lblMembershipSelectedImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblMembershipSelectedImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblMembershipSelectedImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+ this.lblMembershipSelectedImage.ImageIndex = 0;
+ this.lblMembershipSelectedImage.ImageList = this.imageList1;
+ this.lblMembershipSelectedImage.Location = new System.Drawing.Point(48, 210);
+ this.lblMembershipSelectedImage.Name = "lblMembershipSelectedImage";
+ this.lblMembershipSelectedImage.Size = new System.Drawing.Size(35, 36);
+ this.lblMembershipSelectedImage.TabIndex = 36;
+ this.lblMembershipSelectedImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.lblMembershipSelectedImage.Visible = false;
//
- // lblUseZippedModelDescription
+ // lblMembershipSelected
//
- this.lblUseZippedModelDescription.Location = new System.Drawing.Point(27, 220);
- this.lblUseZippedModelDescription.Name = "lblUseZippedModelDescription";
- this.lblUseZippedModelDescription.Size = new System.Drawing.Size(428, 30);
- this.lblUseZippedModelDescription.TabIndex = 29;
- this.lblUseZippedModelDescription.Text = "This option will instruct the wizard to emit the empty model as an XMI file insid" +
- "e a zip file, instead of plain XMI file";
+ this.lblMembershipSelected.Location = new System.Drawing.Point(89, 210);
+ this.lblMembershipSelected.Name = "lblMembershipSelected";
+ this.lblMembershipSelected.Size = new System.Drawing.Size(357, 47);
+ this.lblMembershipSelected.TabIndex = 35;
+ this.lblMembershipSelected.Text = "You selected membership support on the previous page which requires a web common " +
+ "project. Please enter the name of the new project or select an existing class l" +
+ "ibrary project.";
+ this.lblMembershipSelected.Visible = false;
//
- // cbUseZippedModel
+ // cbConfigureWebCommonProject
//
- this.cbUseZippedModel.AutoSize = true;
- this.cbUseZippedModel.Enabled = false;
- this.cbUseZippedModel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbUseZippedModel.Location = new System.Drawing.Point(30, 201);
- this.cbUseZippedModel.Name = "cbUseZippedModel";
- this.cbUseZippedModel.Size = new System.Drawing.Size(126, 17);
- this.cbUseZippedModel.TabIndex = 2;
- this.cbUseZippedModel.Text = "Use zipped model file";
- this.cbUseZippedModel.UseVisualStyleBackColor = true;
+ this.cbConfigureWebCommonProject.AutoSize = true;
+ this.cbConfigureWebCommonProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbConfigureWebCommonProject.Location = new System.Drawing.Point(12, 80);
+ this.cbConfigureWebCommonProject.Name = "cbConfigureWebCommonProject";
+ this.cbConfigureWebCommonProject.Size = new System.Drawing.Size(202, 17);
+ this.cbConfigureWebCommonProject.TabIndex = 0;
+ this.cbConfigureWebCommonProject.Text = "Configure web common project";
+ this.cbConfigureWebCommonProject.UseVisualStyleBackColor = true;
+ this.cbConfigureWebCommonProject.CheckedChanged += new System.EventHandler(this.cbEnableWebCommonProject_CheckedChanged);
//
- // header9
+ // usrWebCommonProject
//
- this.header9.BackColor = System.Drawing.SystemColors.Control;
- this.header9.CausesValidation = false;
- this.header9.Description = "You can fine tune the output of the solution wizard with these settings.";
- this.header9.Dock = System.Windows.Forms.DockStyle.Top;
- this.header9.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header9.Location = new System.Drawing.Point(0, 0);
- this.header9.Name = "header9";
- this.header9.Size = new System.Drawing.Size(525, 65);
- this.header9.TabIndex = 27;
- this.header9.Title = "Advanced Settings";
+ this.usrWebCommonProject.Location = new System.Drawing.Point(30, 102);
+ this.usrWebCommonProject.Name = "usrWebCommonProject";
+ this.usrWebCommonProject.ProjectName = "";
+ this.usrWebCommonProject.Size = new System.Drawing.Size(416, 93);
+ this.usrWebCommonProject.TabIndex = 1;
//
- // wizardPageSolutionInfo
+ // header8
//
- this.wizardPageSolutionInfo.Controls.Add(this.cbShowAdvancedOptions);
- this.wizardPageSolutionInfo.Controls.Add(this.ddlVersionControl);
- this.wizardPageSolutionInfo.Controls.Add(this.ddlDatabaseType);
- this.wizardPageSolutionInfo.Controls.Add(this.label10);
- this.wizardPageSolutionInfo.Controls.Add(this.label1);
- this.wizardPageSolutionInfo.Controls.Add(this.label17);
- this.wizardPageSolutionInfo.Controls.Add(this.txtApplicationName);
- this.wizardPageSolutionInfo.Controls.Add(this.label12);
- this.wizardPageSolutionInfo.Controls.Add(this.header6);
- this.wizardPageSolutionInfo.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageSolutionInfo.IsFinishPage = false;
- this.wizardPageSolutionInfo.Location = new System.Drawing.Point(0, 0);
- this.wizardPageSolutionInfo.Name = "wizardPageSolutionInfo";
- this.wizardPageSolutionInfo.Size = new System.Drawing.Size(525, 312);
- this.wizardPageSolutionInfo.TabIndex = 8;
- this.wizardPageSolutionInfo.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSolutionInfo_CloseFromNext);
- this.wizardPageSolutionInfo.ShowFromBack += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
- this.wizardPageSolutionInfo.ShowFromNext += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
+ this.header8.BackColor = System.Drawing.SystemColors.Control;
+ this.header8.CausesValidation = false;
+ this.header8.Description = "The web common project is a class library that contains web site support classes." +
+ "";
+ this.header8.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header8.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
+ this.header8.Location = new System.Drawing.Point(0, 0);
+ this.header8.Name = "header8";
+ this.header8.Size = new System.Drawing.Size(525, 65);
+ this.header8.TabIndex = 28;
+ this.header8.Title = "Web Common Project";
//
- // cbShowAdvancedOptions
+ // wizardPageWebProject
//
- this.cbShowAdvancedOptions.AutoSize = true;
- this.cbShowAdvancedOptions.Location = new System.Drawing.Point(30, 250);
- this.cbShowAdvancedOptions.Name = "cbShowAdvancedOptions";
- this.cbShowAdvancedOptions.Size = new System.Drawing.Size(140, 17);
- this.cbShowAdvancedOptions.TabIndex = 3;
- this.cbShowAdvancedOptions.Text = "Show advanced options";
- this.cbShowAdvancedOptions.UseVisualStyleBackColor = true;
+ this.wizardPageWebProject.Controls.Add(this.cbConfigureWebProject);
+ this.wizardPageWebProject.Controls.Add(this.usrWebProject);
+ this.wizardPageWebProject.Controls.Add(this.lblStoreSettingsInNHibernateConfigDescription);
+ this.wizardPageWebProject.Controls.Add(this.lblAddMembershipSupportText);
+ this.wizardPageWebProject.Controls.Add(this.cbUseNHibernateConfig);
+ this.wizardPageWebProject.Controls.Add(this.cbAddMembershipSupport);
+ this.wizardPageWebProject.Controls.Add(this.header7);
+ this.wizardPageWebProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageWebProject.IsFinishPage = false;
+ this.wizardPageWebProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageWebProject.Name = "wizardPageWebProject";
+ this.wizardPageWebProject.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageWebProject.TabIndex = 9;
+ this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext);
+ this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext);
//
- // ddlVersionControl
+ // cbConfigureWebProject
//
- this.ddlVersionControl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.ddlVersionControl.FormattingEnabled = true;
- this.ddlVersionControl.Items.AddRange(new object[] {
- "None",
- "CVS"});
- this.ddlVersionControl.Location = new System.Drawing.Point(30, 201);
- this.ddlVersionControl.Name = "ddlVersionControl";
- this.ddlVersionControl.Size = new System.Drawing.Size(394, 21);
- this.ddlVersionControl.TabIndex = 2;
+ this.cbConfigureWebProject.AutoSize = true;
+ this.cbConfigureWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbConfigureWebProject.Location = new System.Drawing.Point(12, 80);
+ this.cbConfigureWebProject.Name = "cbConfigureWebProject";
+ this.cbConfigureWebProject.Size = new System.Drawing.Size(150, 17);
+ this.cbConfigureWebProject.TabIndex = 0;
+ this.cbConfigureWebProject.Text = "Configure web project";
+ this.cbConfigureWebProject.UseVisualStyleBackColor = true;
+ this.cbConfigureWebProject.CheckedChanged += new System.EventHandler(this.cbAddWebProjectSupport_CheckedChanged);
//
- // ddlDatabaseType
+ // usrWebProject
//
- this.ddlDatabaseType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.ddlDatabaseType.FormattingEnabled = true;
- this.ddlDatabaseType.Items.AddRange(new object[] {
- "Microsoft SQL Server",
- "MySQL",
- "Oracle 9i",
- "Hypersonic"});
- this.ddlDatabaseType.Location = new System.Drawing.Point(30, 152);
- this.ddlDatabaseType.Name = "ddlDatabaseType";
- this.ddlDatabaseType.Size = new System.Drawing.Size(394, 21);
- this.ddlDatabaseType.TabIndex = 1;
+ this.usrWebProject.Location = new System.Drawing.Point(30, 102);
+ this.usrWebProject.Name = "usrWebProject";
+ this.usrWebProject.ProjectName = "";
+ this.usrWebProject.Size = new System.Drawing.Size(431, 93);
+ this.usrWebProject.TabIndex = 1;
+ this.usrWebProject.WebProjectMode = true;
//
- // label10
+ // lblStoreSettingsInNHibernateConfigDescription
//
- this.label10.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label10.Location = new System.Drawing.Point(9, 230);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(507, 16);
- this.label10.TabIndex = 6;
- this.label10.Text = "Would you like to configure specific versions of Maven, AndroMDA, etc?";
+ this.lblStoreSettingsInNHibernateConfigDescription.Location = new System.Drawing.Point(47, 221);
+ this.lblStoreSettingsInNHibernateConfigDescription.Name = "lblStoreSettingsInNHibernateConfigDescription";
+ this.lblStoreSettingsInNHibernateConfigDescription.Size = new System.Drawing.Size(428, 30);
+ this.lblStoreSettingsInNHibernateConfigDescription.TabIndex = 3;
+ this.lblStoreSettingsInNHibernateConfigDescription.Text = "This options stores the database connection settings in nhibernate.config instead" +
+ " of the web.config";
+ this.lblStoreSettingsInNHibernateConfigDescription.Click += new System.EventHandler(this.lblStoreSettingsInNHibernateConfigDescription_Click);
//
- // label1
+ // lblAddMembershipSupportText
//
- this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label1.Location = new System.Drawing.Point(9, 179);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(507, 16);
- this.label1.TabIndex = 6;
- this.label1.Text = "Which version control system will you be using, if any?";
+ this.lblAddMembershipSupportText.Location = new System.Drawing.Point(47, 273);
+ this.lblAddMembershipSupportText.Name = "lblAddMembershipSupportText";
+ this.lblAddMembershipSupportText.Size = new System.Drawing.Size(428, 30);
+ this.lblAddMembershipSupportText.TabIndex = 3;
+ this.lblAddMembershipSupportText.Text = "This options adds users and roles to the UML model and the DomainMembershipProvid" +
+ "er to the solution for ASP.NET Membership support.";
//
- // label17
+ // cbUseNHibernateConfig
//
- this.label17.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label17.Location = new System.Drawing.Point(9, 130);
- this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(507, 16);
- this.label17.TabIndex = 4;
- this.label17.Text = "Which database server will your application use?";
+ this.cbUseNHibernateConfig.AutoSize = true;
+ this.cbUseNHibernateConfig.Checked = true;
+ this.cbUseNHibernateConfig.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cbUseNHibernateConfig.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbUseNHibernateConfig.Location = new System.Drawing.Point(30, 204);
+ this.cbUseNHibernateConfig.Name = "cbUseNHibernateConfig";
+ this.cbUseNHibernateConfig.Size = new System.Drawing.Size(221, 17);
+ this.cbUseNHibernateConfig.TabIndex = 2;
+ this.cbUseNHibernateConfig.Text = "Store settings in nhibernate.config";
+ this.cbUseNHibernateConfig.UseVisualStyleBackColor = true;
+ this.cbUseNHibernateConfig.CheckedChanged += new System.EventHandler(this.cbAddMembershipSupport_CheckedChanged);
//
- // txtApplicationName
+ // cbAddMembershipSupport
//
- this.txtApplicationName.BackColor = System.Drawing.SystemColors.Window;
- this.txtApplicationName.Location = new System.Drawing.Point(30, 103);
- this.txtApplicationName.Name = "txtApplicationName";
- this.txtApplicationName.Size = new System.Drawing.Size(394, 21);
- this.txtApplicationName.TabIndex = 0;
+ this.cbAddMembershipSupport.AutoSize = true;
+ this.cbAddMembershipSupport.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbAddMembershipSupport.Location = new System.Drawing.Point(30, 256);
+ this.cbAddMembershipSupport.Name = "cbAddMembershipSupport";
+ this.cbAddMembershipSupport.Size = new System.Drawing.Size(169, 17);
+ this.cbAddMembershipSupport.TabIndex = 2;
+ this.cbAddMembershipSupport.Text = "Add membership support";
+ this.cbAddMembershipSupport.UseVisualStyleBackColor = true;
+ this.cbAddMembershipSupport.CheckedChanged += new System.EventHandler(this.cbAddMembershipSupport_CheckedChanged);
//
- // label12
+ // header7
//
- this.label12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label12.Location = new System.Drawing.Point(9, 81);
- this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(507, 16);
- this.label12.TabIndex = 0;
- this.label12.Text = "What is the name of your application? (Example: Time Tracker)";
+ this.header7.BackColor = System.Drawing.SystemColors.Control;
+ this.header7.CausesValidation = false;
+ this.header7.Description = "This wizard can either create or update a web site to support NHibernate";
+ this.header7.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header7.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
+ this.header7.Location = new System.Drawing.Point(0, 0);
+ this.header7.Name = "header7";
+ this.header7.Size = new System.Drawing.Size(525, 65);
+ this.header7.TabIndex = 27;
+ this.header7.Title = "Web Project";
//
- // header6
+ // wizardPageUnitTestingProject
//
- this.header6.BackColor = System.Drawing.SystemColors.Control;
- this.header6.CausesValidation = false;
- this.header6.Description = "Please enter the following general information about your applicaiton.";
- this.header6.Dock = System.Windows.Forms.DockStyle.Top;
- this.header6.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header6.Location = new System.Drawing.Point(0, 0);
- this.header6.Name = "header6";
- this.header6.Size = new System.Drawing.Size(525, 65);
- this.header6.TabIndex = 26;
- this.header6.Title = "Application Information";
+ this.wizardPageUnitTestingProject.Controls.Add(this.cbConfigureUnitTestingProject);
+ this.wizardPageUnitTestingProject.Controls.Add(this.usrTestProject);
+ this.wizardPageUnitTestingProject.Controls.Add(this.header10);
+ this.wizardPageUnitTestingProject.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageUnitTestingProject.IsFinishPage = false;
+ this.wizardPageUnitTestingProject.Location = new System.Drawing.Point(0, 0);
+ this.wizardPa...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2006-07-27 02:09:45
|
User: cmicali Date: 06/07/26 19:09:44 Modified: etc/andromda-dotnet/Lib DLL Versions.txt Log: - Updated AndroMDA.NHibernateSupport to v1.0.4.0 Revision Changes Path No revision No revision |
|
From: Chris M. <cm...@us...> - 2006-07-27 02:08:52
|
User: cmicali
Date: 06/07/26 19:08:51
Modified: etc/andromda-dotnet/Lib/AndroMDA.NHibernateSupport
AndroMDA.NHibernateSupport.dll
Log:
- Updated to v1.0.4.0
Revision Changes Path
1.2 +219 -88 plugins/etc/andromda-dotnet/Lib/AndroMDA.NHibernateSupport/AndroMDA.NHibernateSupport.dll
<<Binary file>>
|
|
From: Chris M. <cm...@us...> - 2006-07-25 13:09:40
|
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 @@
/// <repository name="netBeansMDR">
/// <models>
/// <model>
+ /// <uri>${model.uri}</uri>
+ /// [rest of string was truncated]";.
+ /// </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 <andromda>
+ /// <properties>
+ /// <property name="modelValidation">true</property>
+ /// <property name="cartridgeFilter">${filter}</property>
+ /// <!-- <property name="loggingConfigurationUri">file:log4j.xml</property> -->
+ /// </properties>
+ /// <server>
+ /// <host>localhost</host>
+ /// <port>4446</port>
+ /// </server>
+ /// <repositories>
+ /// <repository name="netBeansMDR">
+ /// <models>
+ /// <model>
/// <uri>${maven.andromda.model.uri}</uri>
/// [rest of string was truncated]";.
/// </summary>
@@ -304,6 +342,31 @@
}
/// <summary>
+ /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8"?>
+ ///<mappings name="MergeMappings">
+ ///
+ /// <!-- Standard header for all C# files -->
+ /// <mapping>
+ /// <from><![CDATA[// license-header cs merge-point]]></from>
+ /// <to><![CDATA[
+ /////
+ ///// License text for C# files - Change in mda/conf/mappings/MergeMappings.xml
+ /////
+ ///]]></to>
+ /// </mapping>
+ ///
+ /// <!-- Standard header for all hibernate mapping files -->
+ /// <mapping>
+ /// <from><![CDATA[license-header hbm merge-point]]></from>
+ /// <to><![CDATA[ [rest of string was truncated]";.
+ /// </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 <project xmlns="http://maven.apache.org/POM/4.0.0"
+ /// xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ /// xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ /// <modelVersion>4.0.0</modelVersion>
+ /// <parent>
+ /// <groupId>${wizard.application.name.nospaces}</groupId>
+ /// <artifactId>${wizard.application.name.nospaces}</artifactId>
+ /// <version>1.0</version>
+ /// </parent>
+ /// <artifactId>${wizard.application.name.nospaces}-md [rest of string was truncated]";.
+ /// </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]";.
+ ///maven.andromda.commonAssemblyName=${wizard.projects.common.name}
+ ///maven.andromda.coreAssemblyName=${wizard.proje [rest of string was truncated]";.
/// </summary>
internal static string mda_project_properties {
get {
@@ -580,6 +662,24 @@
}
/// <summary>
+ /// Looks up a localized string similar to <project xmlns="http://maven.apache.org/POM/4.0.0"
+ /// xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ /// xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ /// <modelVersion>4.0.0</modelVersion>
+ /// <groupId>${wizard.application.name.nospaces}</groupId>
+ /// <artifactId>${wizard.application.name.nospaces}</artifactId>
+ /// <packaging>pom</packaging>
+ /// <version>1.0</version>
+ /// <name>${wizard.application.name.nospaces}</name>
+ /// <description>$ [rest of string was truncated]";.
+ /// </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("Usage:");
- /// Console.WriteLine(" SchemaExport [script] [export]");
- /// Console.WriteLine(" script=t outputs DDL to the console");
- /// Console.WriteLine(" export=t [rest of string was truncated]";.
+ ///
+ /// // Initialize Log4Net
+ /// log4net.Config.XmlConfigurator.Configure();
+ ///
+ /// // Get the schema files
+ /// string createSchemaFile = ConfigurationManager.AppSettings["schema.create.file"];
+ /// string [rest of string was truncated]";.
/// </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 <settings>
/// <profiles>
/// <profile>
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] |
|
From: Chris M. <cm...@us...> - 2006-07-25 13:07:34
|
User: cmicali Date: 06/07/25 06:07:30 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf/mappings - New directory |
|
From: Chris M. <cm...@us...> - 2006-07-25 12:33:47
|
User: cmicali Date: 06/07/25 05:33:41 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven - New directory |
