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: Vance K. <va...@us...> - 2007-01-24 04:32:47
|
User: vancek Date: 07/01/23 20:32:48 plugins/samples/timetracker-ejb3/core/src/test/java/org - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:47
|
User: vancek Date: 07/01/23 20:32:48 plugins/samples/timetracker-ejb3/core/src/main/java/org/andromda/timetracker - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:46
|
User: vancek Date: 07/01/23 20:32:48 plugins/samples/timetracker-ejb3/core/src/main/java/org/andromda - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:45
|
User: vancek Date: 07/01/23 20:32:47 plugins/samples/timetracker-ejb3/common/src/main/java/org/andromda - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:45
|
User: vancek Date: 07/01/23 20:32:47 plugins/samples/timetracker-ejb3/common/src/main/java/org/andromda/timetracker - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:45
|
User: vancek Date: 07/01/23 20:32:46 plugins/samples/timetracker-ejb3/common/src/main/java - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:45
|
User: vancek Date: 07/01/23 20:32:46 plugins/samples/timetracker-ejb3/common/src/main - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:45
|
User: vancek Date: 07/01/23 20:32:46 plugins/samples/timetracker-ejb3/common/src - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:45
|
User: vancek Date: 07/01/23 20:32:46 plugins/samples/timetracker-ejb3/common - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:44
|
User: vancek Date: 07/01/23 20:32:45 plugins/samples/timetracker-ejb3/client/src/main/java/org/andromda - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:44
|
User: vancek Date: 07/01/23 20:32:45 plugins/samples/timetracker-ejb3/client/src/main/java - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:44
|
User: vancek Date: 07/01/23 20:32:45 plugins/samples/timetracker-ejb3/app/src/main/config - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:43
|
User: vancek Date: 07/01/23 20:32:45 plugins/samples/timetracker-ejb3/client/src - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:43
|
User: vancek Date: 07/01/23 20:32:44 plugins/samples/timetracker-ejb3/app/src/main - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:43
|
User: vancek Date: 07/01/23 20:32:45 plugins/samples/timetracker-ejb3/client - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:43
|
User: vancek Date: 07/01/23 20:32:45 plugins/samples/timetracker-ejb3/app/src/main/application/META-INF - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:43
|
User: vancek Date: 07/01/23 20:32:44 plugins/samples/timetracker-ejb3/app/src/main/application - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:43
|
User: vancek Date: 07/01/23 20:32:44 plugins/samples/timetracker-ejb3/app/src - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:42
|
User: vancek Date: 07/01/23 20:32:44 plugins/samples/timetracker-ejb3/app - New directory |
|
From: Vance K. <va...@us...> - 2007-01-24 04:32:42
|
User: vancek Date: 07/01/23 20:32:43 plugins/samples/timetracker-ejb3 - New directory |
|
From: Vance K. <va...@us...> - 2007-01-23 01:24:12
|
User: vancek
Date: 07/01/22 17:24:13
Modified: andromda-ejb3/src/main/resources/templates/ejb3 DaoBase.vsl
Log:
inject org.hibernate.Session into DAO base if hibernateExtensionEnabled is true - i.e. use in search criteria
Revision Changes Path
1.11 +10 -0 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/DaoBase.vsl
Index: DaoBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/DaoBase.vsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- DaoBase.vsl 17 Jan 2007 00:50:56 -0000 1.10
+++ DaoBase.vsl 23 Jan 2007 01:24:13 -0000 1.11
@@ -1,3 +1,4 @@
+#parse("templates/ejb3/Globals.vm")
// license-header java merge-point
//
// Attention: Generated code! Do not modify by hand!
@@ -59,6 +60,15 @@
protected javax.persistence.EntityManager emanager;
+#if ($hibernateExtensionEnabled)
+ /**
+ * Injext Hibernate Session
+ */
+ @javax.persistence.PersistenceContext#if ($entity.defaultPersistenceContextUnitName)(unitName = "${entity.defaultPersistenceContextUnitName}")#end
+
+ protected org.hibernate.Session hibernateSession;
+
+#end
#foreach($entityRef in $entity.entityReferences)
private $entityRef.targetElement.fullyQualifiedDaoName $entityRef.daoName;
|
|
From: Vance K. <va...@us...> - 2007-01-23 01:22:47
|
User: vancek
Date: 07/01/22 17:22:44
Modified: andromda-ejb3/src/main/resources/templates/ejb3
SessionBeanBase.vsl
Log:
hibernate specific annotations should only be rendered if hibernateExtensionEnabled is true
Revision Changes Path
1.10 +4 -4 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanBase.vsl
Index: SessionBeanBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanBase.vsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- SessionBeanBase.vsl 17 Jan 2007 00:50:56 -0000 1.9
+++ SessionBeanBase.vsl 23 Jan 2007 01:22:44 -0000 1.10
@@ -197,9 +197,6 @@
* The $attribute.name property
*/
#* *##if ($service.seamComponent)
-## $hibernateExtensionEnabled &&
-## Only enable JBoss Seam components if Hibernate extensions are enabled
-##
#* *##if ($attribute.seamBijectionIn)
@org.jboss.seam.annotations.In#if ($stringUtils.isNotEmpty($attribute.seamBijectionInParameters))$attribute.seamBijectionInParameters#end
@@ -228,7 +225,10 @@
@org.jboss.seam.annotations.datamodel.DataModelSelectionIndex#if ($stringUtils.isNotEmpty($attribute.seamDataModelSelectionIndexParameters))$attribute.seamDataModelSelectionIndexParameters#end
#* *##end
-#* *##if ($attribute.seamValidationValid)
+##
+## Only enable JBoss Seam components if Hibernate extensions are enabled
+##
+#* *##if ($attribute.seamValidationValid && $hibernateExtensionEnabled)
@org.hibernate.validator.Valid
#* *##end
|
|
From: Chris M. <cm...@us...> - 2007-01-22 13:22:52
|
User: cmicali
Date: 07/01/22 05:22:52
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn
AndroMDA.VS80AddIn.sln Android VS Readme.rtf
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
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven
Maven1Proxy.cs Maven2Proxy.cs MavenProxy.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/OptionsPages
AboutOptionsPage.cs ExternalToolsOptionsPage.cs
GeneralOptionsPage.cs MDAOptionPageProperties.cs
SolutionExplorerOptionsPage.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
AddInUtils.cs AsyncOperation.cs CodeModelUtils.cs
ConfigFile.cs FileUtils.cs SettingsManager.cs
VSExternalToolEventArgs.cs VSExternalToolProxy.cs
VSSolutionUtils.cs ValidationUtils.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards
MDASolutionWizard.cs MDASolutionWizard.designer.cs
WelcomeWizard.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS
Setup.nsi
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
AndroMDA.NHibernateSupport.dll
AndroMDA.ScenarioUnit.dll Bamboo.Prevalence.dll
Castle.DynamicProxy.dll HashCodeProvider.dll
Iesi.Collections.dll
NHibernate.Caches.Prevalence.dll
NHibernate.Caches.SysCache.dll
NHibernate.Nullables2.dll NHibernate.dll
NXUnit.Framework.dll log4net.dll nunit.core.dll
nunit.framework.dll
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
DomainMembershipProvider.cs DomainMembershipUser.cs
DomainRoleProvider.cs MembershipServiceImpl.cs
UserDaoImpl.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
App.config SchemaExport.cs TestDataManager.cs
cvsignore nhibernate.config
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
App.config nhibernate.config
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
cvsignore nhibernate.config web.config
web.config.membershipsection web.config.nhibernate
web.config.rolesection
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
cvsignore pom.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
andromda.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
MergeMappings.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
cvsignore pom.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Solution
empty-model.membership.xmi empty-model.xmi
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Welcome
build.properties settings.xml
Removed: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Common
cvsignore project.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Core
cvsignore project.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Lib
AndroMDA.NHibernateSupport.dll
Bamboo.Prevalence.dll Castle.DynamicProxy.dll
HashCodeProvider.dll Iesi.Collections.dll
NHibernate.Caches.Prevalence.dll
NHibernate.Caches.SysCache.dll
NHibernate.Nullables2.dll NHibernate.dll
log4net.dll
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Membership
DomainMembershipProvider.cs DomainMembershipUser.cs
DomainRoleProvider.cs MembershipServiceImpl.cs
UserDaoImpl.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/SchemaExport
App.config Program.cs TestDataManager.cs cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web/Bin
cvsignore
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/Web
cvsignore web.config web.config.membershipsection
web.config.nhibernate web.config.rolesection
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
build.properties cvsignore maven.xml
nhibernate.config pom.xml project.properties
project.xml settings.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf
andromda-m2.xml andromda.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/conf/mappings
MergeMappings.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda
cvsignore maven.xml pom.xml project.properties
project.xml
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources/mda/src/uml
empty.model.membership.xml empty.model.xml
Log:
- Updated copyrights
- Changed solution wizard to read files from disk instead of embedded resources
Revision Changes Path
1.2 +4 -0 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.sln
Index: AndroMDA.VS80AddIn.sln
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- AndroMDA.VS80AddIn.sln 18 Apr 2006 16:14:43 -0000 1.1
+++ AndroMDA.VS80AddIn.sln 22 Jan 2007 13:22:40 -0000 1.2
@@ -2,6 +2,10 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroMDA.VS80AddIn", "AndroMDA.VS80AddIn\AndroMDA.VS80AddIn.csproj", "{93AB0FE0-3A0F-44E5-A4A0-AFBCAB0C8049}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
No revision
No revision
No revision
1.16 +23 -1 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.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- AddInSettings.cs 2 Oct 2006 01:57:05 -0000 1.15
+++ AddInSettings.cs 22 Jan 2007 13:22:40 -0000 1.16
@@ -1,6 +1,6 @@
// Android/VS
-// (c)2006 AndroMDA.org
+// (c)2007 AndroMDA.org
#region Using statements
@@ -27,10 +27,14 @@
public const int ADDIN_SETTINGS_VERSION = 10;
+ private const string WELCOME_WIZARD_RESOURCES_FOLDER_NAME = "Welcome Wizard Files";
+ private const string SOLUTION_WIZARD_RESOURCES_FOLDER_NAME = "Solution Wizard Files";
+
#region Member variables
private SettingsManager m_settings = null;
private DTE m_applicationObject = null;
+ private string m_resourcesLocation = string.Empty;
#endregion
@@ -40,6 +44,9 @@
{
m_applicationObject = applicationObject;
m_settings = new SettingsManager(m_applicationObject);
+ m_resourcesLocation = System.Reflection.Assembly.GetCallingAssembly().Location;
+ m_resourcesLocation = m_resourcesLocation.Replace(System.Reflection.Assembly.GetCallingAssembly().ManifestModule.Name, string.Empty);
+ m_resourcesLocation = m_resourcesLocation.TrimEnd('\\');
if (FirstRun)
{
FirstRun = false;
@@ -66,6 +73,21 @@
#region General settings
+ public string ResourcesLocation
+ {
+ get { return m_resourcesLocation; }
+ }
+
+ public string WelcomeWizardResourcesLocation
+ {
+ get { return m_resourcesLocation + "\\" + WELCOME_WIZARD_RESOURCES_FOLDER_NAME; }
+ }
+
+ public string SolutionWizardResourcesLocation
+ {
+ get { return m_resourcesLocation + "\\" + SOLUTION_WIZARD_RESOURCES_FOLDER_NAME; }
+ }
+
public bool FirstRun
{
get { return m_settings.GetBool(SETTING_NAME_PREFIX + "FirstRun", true); }
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- AndroMDA.VS80AddIn.AddIn 25 Jul 2006 13:09:28 -0000 1.6
+++ AndroMDA.VS80AddIn.AddIn 22 Jan 2007 13:22:40 -0000 1.7
@@ -8,7 +8,7 @@
<Addin>
<FriendlyName>Android/VS</FriendlyName>
- <Description>Add-In that integrates Visual Studio 2005 with AndroMDA.</Description>
+ <Description>Visual Studio 2005 integration for 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.21 +135 -47 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.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- AndroMDA.VS80AddIn.csproj 13 Dec 2006 19:21:39 -0000 1.20
+++ AndroMDA.VS80AddIn.csproj 22 Jan 2007 13:22:40 -0000 1.21
@@ -69,6 +69,27 @@
<Compile Include="Commands\GenerateCodeCommand.cs" />
<Compile Include="Commands\RunSolutionWizardCommand.cs" />
<Compile Include="Commands\StopCommand.cs" />
+ <Content Include="Solution Wizard Files\Membership\DomainMembershipProvider.cs">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Membership\DomainMembershipUser.cs">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Membership\DomainRoleProvider.cs">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Membership\MembershipServiceImpl.cs">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Membership\UserDaoImpl.cs">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\SchemaExport\SchemaExport.cs">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\SchemaExport\TestDataManager.cs">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Compile Include="Utils\ConfigFile.cs" />
<Compile Include="Connect.cs" />
<Compile Include="Controls\MDAProjectSetupControl.cs">
@@ -98,11 +119,6 @@
<Compile Include="Maven\MavenProxy.cs" />
<Compile Include="MDAProject.cs" />
<Compile Include="MDASolutionManager.cs" />
- <None Include="Resources\Membership\DomainMembershipProvider.cs" />
- <None Include="Resources\Membership\DomainMembershipUser.cs" />
- <None Include="Resources\Membership\DomainRoleProvider.cs" />
- <None Include="Resources\Membership\MembershipServiceImpl.cs" />
- <None Include="Resources\Membership\UserDaoImpl.cs" />
<Compile Include="OptionsPages\AboutOptionsPage.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -128,7 +144,6 @@
<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" />
@@ -314,7 +329,72 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="AddIn.ico" />
- <None Include="Resources\build.properties" />
+ <Content Include="Solution Wizard Files\Lib\AndroMDA.NHibernateSupport.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Lib\AndroMDA.ScenarioUnit.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Lib\Bamboo.Prevalence.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Lib\Castle.DynamicProxy.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Lib\HashCodeProvider.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Lib\Iesi.Collections.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Lib\log4net.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Lib\NHibernate.Caches.Prevalence.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Lib\NHibernate.Caches.SysCache.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Lib\NHibernate.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Lib\NHibernate.Nullables2.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Lib\nunit.core.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Lib\nunit.framework.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Lib\NXUnit.Framework.dll">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\mda\conf\andromda.xml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\mda\conf\mappings\MergeMappings.xml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\mda\pom.xml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <None Include="Solution Wizard Files\mda\src\uml\empty-model.membership.xmi">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ <Content Include="Solution Wizard Files\mda\src\uml\empty-model.xmi">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\pom.xml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Welcome Wizard Files\settings.xml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Welcome Wizard Files\build.properties">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<None Include="Resources\indicator_arrows.gif" />
<None Include="Resources\link_add.png" />
<None Include="Resources\expand.gif" />
@@ -323,48 +403,56 @@
<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" />
- <None Include="Resources\mda\pom.xml" />
- <Content Include="Resources\mda\src\uml\empty.model.membership.xml" />
- <None Include="Resources\pom.xml" />
- <None Include="Resources\settings.xml" />
<None Include="Resources\rightbox.bmp" />
<None Include="Resources\orange.bmp" />
- <None Include="Resources\Common\cvsignore" />
- <None Include="Resources\Core\cvsignore" />
- <None Include="Resources\cvsignore" />
- <None Include="Resources\maven.xml" />
- <None Include="Resources\mda\cvsignore" />
- <None Include="Resources\nhibernate.config" />
- <None Include="Resources\project.properties" />
- <None Include="Resources\project.xml" />
- <None Include="Resources\mda\maven.xml" />
- <None Include="Resources\mda\project.properties" />
- <None Include="Resources\mda\project.xml" />
- <None Include="Resources\mda\conf\andromda.xml" />
- <None Include="Resources\mda\src\uml\empty.model.xml" />
- <None Include="Resources\Common\project.xml" />
- <None Include="Resources\Core\project.xml" />
- <None Include="Resources\SchemaExport\App.config" />
- <None Include="Resources\SchemaExport\cvsignore" />
- <None Include="Resources\SchemaExport\Program.cs" />
- <None Include="Resources\Lib\AndroMDA.NHibernateSupport.dll" />
- <None Include="Resources\Lib\Bamboo.Prevalence.dll" />
- <None Include="Resources\Lib\Castle.DynamicProxy.dll" />
- <None Include="Resources\Lib\HashCodeProvider.dll" />
- <None Include="Resources\Lib\Iesi.Collections.dll" />
- <None Include="Resources\Lib\log4net.dll" />
- <None Include="Resources\Lib\NHibernate.Caches.Prevalence.dll" />
- <None Include="Resources\Lib\NHibernate.Caches.SysCache.dll" />
- <None Include="Resources\Lib\NHibernate.dll" />
- <None Include="Resources\Lib\NHibernate.Nullables2.dll" />
- <None Include="Resources\Web\Bin\cvsignore" />
- <None Include="Resources\Web\web.config.membershipsection" />
- <None Include="Resources\Web\cvsignore" />
- <None Include="Resources\Web\web.config" />
- <None Include="Resources\Web\web.config.nhibernate" />
- <None Include="Resources\Web\web.config.rolesection" />
+ <Content Include="Solution Wizard Files\Tests\nhibernate.config">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\SchemaExport\nhibernate.config">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Common\cvsignore">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Core\cvsignore">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\cvsignore">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\mda\cvsignore">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Web\nhibernate.config">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\SchemaExport\App.config">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\SchemaExport\cvsignore">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Tests\App.config">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Web\Bin\cvsignore">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Web\cvsignore">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Web\web.config">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Web\web.config.membershipsection">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Web\web.config.nhibernate">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Solution Wizard Files\Web\web.config.rolesection">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup>
1.8 +1 -1 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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- AssemblyInfo.cs 25 Jul 2006 13:09:28 -0000 1.7
+++ AssemblyInfo.cs 22 Jan 2007 13:22:40 -0000 1.8
@@ -1,6 +1,6 @@
// Android/VS
-// (c)2006 AndroMDA.org
+// (c)2007 AndroMDA.org
#region Using statements
1.5 +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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- Connect.cs 25 Jul 2006 13:09:28 -0000 1.4
+++ Connect.cs 22 Jan 2007 13:22:40 -0000 1.5
@@ -1,6 +1,6 @@
// Android/VS
-// (c)2006 AndroMDA.org
+// (c)2007 AndroMDA.org
#region Using statements
1.4 +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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- ConversionCodeGenerator.cs 13 Dec 2006 16:03:57 -0000 1.3
+++ ConversionCodeGenerator.cs 22 Jan 2007 13:22:40 -0000 1.4
@@ -1,6 +1,6 @@
// Android/VS
-// (c)2006 AndroMDA.org
+// (c)2007 AndroMDA.org
#region Using statements
1.6 +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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- MDAProject.cs 25 Jul 2006 13:09:28 -0000 1.5
+++ MDAProject.cs 22 Jan 2007 13:22:40 -0000 1.6
@@ -1,6 +1,6 @@
// Android/VS
-// (c)2006 AndroMDA.org
+// (c)2007 AndroMDA.org
#region Using statements
1.20 +1 -1 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.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- MDASolutionManager.cs 13 Dec 2006 16:03:57 -0000 1.19
+++ MDASolutionManager.cs 22 Jan 2007 13:22:40 -0000 1.20
@@ -1,6 +1,6 @@
// Android/VS
-// (c)2006 AndroMDA.org
+// (c)2007 AndroMDA.org
#region Using statements
1.11 +0 -816 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.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- Resource1.Designer.cs 25 Jul 2006 13:09:28 -0000 1.10
+++ Resource1.Designer.cs 22 Jan 2007 13:22:40 -0000 1.11
@@ -67,90 +67,6 @@
}
}
- /// <summary>
- /// Looks up a localized string similar to maven.repo.remote=http://www.ibiblio.org/maven,http://team.andromda.org/maven.
- /// </summary>
- internal static string build_properties {
- get {
- return ResourceManager.GetString("build_properties", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to bin
- ///obj
- ///target
- ///*.user.
- /// </summary>
- internal static string common_cvsignore {
- get {
- return ResourceManager.GetString("common_cvsignore", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?>
- ///
- ///<project>
- /// <extend>../project.xml</extend>
- /// <artifactId>${pom.groupId}-common</artifactId>
- /// <name>${wizard.application.name} Common</name>
- /// <shortDescription>${pom.name} Component</shortDescription>
- /// <description>
- /// Contains the ${pom.name} module.
- /// </description>
- ///</project>.
- /// </summary>
- internal static string common_project_xml {
- get {
- return ResourceManager.GetString("common_project_xml", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to bin
- ///obj
- ///target
- ///*.user.
- /// </summary>
- internal static string core_cvsignore {
- get {
- return ResourceManager.GetString("core_cvsignore", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?>
- ///
- ///<project>
- /// <extend>../project.xml</extend>
- /// <artifactId>${pom.groupId}-core</artifactId>
- /// <name>${wizard.application.name} Core</name>
- /// <shortDescription>${pom.name} Component</shortDescription>
- /// <description>
- /// Contains the ${pom.name} module.
- /// </description>
- ///</project>.
- /// </summary>
- internal static string core_project_xml {
- get {
- return ResourceManager.GetString("core_project_xml", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to *.suo
- ///*.log
- ///PrecompiledWeb
- ///target
- ///.
- /// </summary>
- internal static string cvsignore {
- get {
- return ResourceManager.GetString("cvsignore", resourceCulture);
- }
- }
-
internal static System.Drawing.Bitmap expand {
get {
object obj = ResourceManager.GetObject("expand", resourceCulture);
@@ -186,76 +102,6 @@
}
}
- internal static byte[] lib_AndroMDA_NHibernateSupport_dll {
- get {
- object obj = ResourceManager.GetObject("lib_AndroMDA_NHibernateSupport_dll", resourceCulture);
- return ((byte[])(obj));
- }
- }
-
- internal static byte[] lib_Bamboo_Prevalence_dll {
- get {
- object obj = ResourceManager.GetObject("lib_Bamboo_Prevalence_dll", resourceCulture);
- return ((byte[])(obj));
- }
- }
-
- internal static byte[] lib_Castle_DynamicProxy_dll {
- get {
- object obj = ResourceManager.GetObject("lib_Castle_DynamicProxy_dll", resourceCulture);
- return ((byte[])(obj));
- }
- }
-
- internal static byte[] lib_HashCodeProvider_dll {
- get {
- object obj = ResourceManager.GetObject("lib_HashCodeProvider_dll", resourceCulture);
- return ((byte[])(obj));
- }
- }
-
- internal static byte[] lib_Iesi_Collections_dll {
- get {
- object obj = ResourceManager.GetObject("lib_Iesi_Collections_dll", resourceCulture);
- return ((byte[])(obj));
- }
- }
-
- internal static byte[] lib_log4net_dll {
- get {
- object obj = ResourceManager.GetObject("lib_log4net_dll", resourceCulture);
- return ((byte[])(obj));
- }
- }
-
- internal static byte[] lib_NHibernate_Caches_Prevalence_dll {
- get {
- object obj = ResourceManager.GetObject("lib_NHibernate_Caches_Prevalence_dll", resourceCulture);
- return ((byte[])(obj));
- }
- }
-
- internal static byte[] lib_NHibernate_Caches_SysCache_dll {
- get {
- object obj = ResourceManager.GetObject("lib_NHibernate_Caches_SysCache_dll", resourceCulture);
- return ((byte[])(obj));
- }
- }
-
- internal static byte[] lib_NHibernate_dll {
- get {
- object obj = ResourceManager.GetObject("lib_NHibernate_dll", resourceCulture);
- return ((byte[])(obj));
- }
- }
-
- internal static byte[] lib_NHibernate_Nullables2_dll {
- get {
- object obj = ResourceManager.GetObject("lib_NHibernate_Nullables2_dll", resourceCulture);
- return ((byte[])(obj));
- }
- }
-
internal static System.Drawing.Bitmap link_add {
get {
object obj = ResourceManager.GetObject("link_add", resourceCulture);
@@ -270,390 +116,6 @@
}
}
- /// <summary>
- /// Looks up a localized string similar to <project default="mda"
- /// xmlns:ant="jelly:ant"
- /// xmlns:maven="jelly:maven"
- /// xmlns:j="jelly:core"
- /// xmlns:util="jelly:util"
- /// xmlns:i="jelly:interaction">
- ///
- /// <ant:property environment="env"/>
- ///
- /// <!-- ==================================================================
- /// Cleans Everything
- /// ================================================================== -->
- /// <goal name="clean">
- /// <attainGoal name="multiproject:clean"/>
- /// <!- [rest of string was truncated]";.
- /// </summary>
- internal static string maven_xml {
- get {
- return ResourceManager.GetString("maven_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>${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>
- internal static string mda_conf_andromda_xml {
- get {
- return ResourceManager.GetString("mda_conf_andromda_xml", resourceCulture);
- }
- }
-
- /// <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 {
- get {
- return ResourceManager.GetString("mda_cvsignore", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to <project default="pom:install">
- /// <preGoal name="pom:install">
- /// <attainGoal name="andromda:run"/>
- /// </preGoal>
- ///</project>
- ///.
- /// </summary>
- internal static string mda_maven_xml {
- get {
- return ...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2007-01-22 03:29:47
|
User: cmicali
Date: 07/01/21 19:29:47
Modified: andromda-cs pom.xml
andromda-nhibernate pom.xml
andromda-nspring pom.xml
Log:
- Updated version to 1.1
Revision Changes Path
1.11 +1 -1 cartridges/andromda-cs/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/pom.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- pom.xml 2 Oct 2006 01:57:04 -0000 1.10
+++ pom.xml 22 Jan 2007 03:29:47 -0000 1.11
@@ -10,7 +10,7 @@
<artifactId>andromda-cs-cartridge</artifactId>
<packaging>andromda-cartridge</packaging>
<name>AndroMDA C# Cartridge</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
<description>Produces C# objects from a model.</description>
<issueManagement>
<system>jira</system>
1.11 +1 -1 cartridges/andromda-nhibernate/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/pom.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- pom.xml 2 Oct 2006 01:21:47 -0000 1.10
+++ pom.xml 22 Jan 2007 03:29:47 -0000 1.11
@@ -10,7 +10,7 @@
<artifactId>andromda-nhibernate-cartridge</artifactId>
<packaging>andromda-cartridge</packaging>
<name>AndroMDA NHibernate Cartridge</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
<description>
Produces NHibernate entities optionally services implemented as Session EJB facades.
</description>
1.8 +1 -1 cartridges/andromda-nspring/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/pom.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- pom.xml 9 Jan 2007 10:45:57 -0000 1.7
+++ pom.xml 22 Jan 2007 03:29:47 -0000 1.8
@@ -10,7 +10,7 @@
<artifactId>andromda-nspring-cartridge</artifactId>
<packaging>andromda-cartridge</packaging>
<name>AndroMDA NSpring Cartridge</name>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
<description>
Generates NSpring with NHibernate support
</description>
|
|
From: Vance K. <va...@us...> - 2007-01-21 04:17:39
|
User: vancek
Date: 07/01/20 20:17:40
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
namespace.xml cartridge.xml
andromda-ejb3/src/site changes.xml
Log:
fix entity to/from entityVO conversion in DAO base class
Revision Changes Path
1.32 +9 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -w -r1.31 -r1.32
--- namespace.xml 24 Aug 2006 08:54:31 -0000 1.31
+++ namespace.xml 21 Jan 2007 04:17:40 -0000 1.32
@@ -1170,6 +1170,15 @@
framework for Java EE 5.
</documentation>
</property>
+ <property name="javaTypeConversionIgnoreList" required="false">
+ <documentation>
+ A list of one or more fully qualified java types that should be ignored whenever a type conversion
+ needs to be done. Currently, there is an issue with ValueObjects generated with the Java Axis
+ mappings that causes the relevant cartidge to generate DAO "entity to value object" type conversions
+ incorrectly for all date types. By listing those date types here, the relevant cartridge will not
+ attempt to auto-generate conversions for date/time related attributes.
+ </documentation>
+ </property>
</propertyGroup>
</properties>
</namespace>
\ No newline at end of file
1.32 +3 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -w -r1.31 -r1.32
--- cartridge.xml 25 Jul 2006 06:42:51 -0000 1.31
+++ cartridge.xml 21 Jan 2007 04:17:40 -0000 1.32
@@ -9,6 +9,9 @@
<templateObject name="stringUtils" className="org.apache.commons.lang.StringUtils"/>
<templateObject name="collectionUtils" className="org.apache.commons.collections.CollectionUtils"/>
<templateObject name="transform" className="org.andromda.cartridges.ejb3.EJB3ScriptHelper"/>
+ <templateObject name="converter" className="org.andromda.utils.JavaTypeConverter">
+ <property reference="javaTypeConversionIgnoreList"/>
+ </templateObject>
<!-- cartridge-templateObject merge-point-->
1.3 +4 -0 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- changes.xml 17 Jan 2007 01:20:46 -0000 1.2
+++ changes.xml 21 Jan 2007 04:17:40 -0000 1.3
@@ -343,6 +343,10 @@
This (EJB3 cartridge with Seam support) is NOT a replacement for the Seam cartridge, but another tool which
can be used with the Seam cartridge to develop Seam (JSF)/EJB 3.0 enabled web application.
</action>
+ <action dev="vancek" type="fix">
+ Fix Entity - EntityVO conversion methods in the DAO base classes by adding the Converter
+ template object to the cartridge.xml and the necessary namespace property to namespace.xml.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
