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: Naresh B. <nb...@us...> - 2006-07-09 12:05:27
|
User: nbhatia Date: 06/07/09 05:05:26 plugins/etc/andromda-dotnet/NHibernate.Nullables2/NHibernate.Nullables2 - New directory |
|
From: Naresh B. <nb...@us...> - 2006-07-09 12:04:23
|
User: nbhatia Date: 06/07/09 05:04:23 plugins/etc/andromda-dotnet/Lib/NHibernateContrib - New directory |
|
From: Naresh B. <nb...@us...> - 2006-07-09 12:04:23
|
User: nbhatia Date: 06/07/09 05:04:23 plugins/etc/andromda-dotnet/Lib/NHibernate.Nullables2 - New directory |
|
From: Naresh B. <nb...@us...> - 2006-07-09 12:04:23
|
User: nbhatia Date: 06/07/09 05:04:23 plugins/etc/andromda-dotnet/Lib/NHibernate - New directory |
|
From: Naresh B. <nb...@us...> - 2006-07-09 12:04:23
|
User: nbhatia Date: 06/07/09 05:04:23 plugins/etc/andromda-dotnet/Lib/AndroMDA.NHibernateSupport - New directory |
|
From: Naresh B. <nb...@us...> - 2006-07-09 12:03:42
|
User: nbhatia Date: 06/07/09 05:03:41 plugins/etc/andromda-dotnet/AndroMDA.NHibernateSupport/src - New directory |
|
From: Naresh B. <nb...@us...> - 2006-07-09 12:02:53
|
User: nbhatia Date: 06/07/09 05:02:52 plugins/etc/andromda-dotnet/NHibernate.Nullables2 - New directory |
|
From: Naresh B. <nb...@us...> - 2006-07-09 12:02:53
|
User: nbhatia Date: 06/07/09 05:02:52 plugins/etc/andromda-dotnet/AndroMDA.NHibernateSupport - New directory |
|
From: Naresh B. <nb...@us...> - 2006-07-09 12:02:53
|
User: nbhatia Date: 06/07/09 05:02:52 plugins/etc/andromda-dotnet/Lib - New directory |
|
From: Chris M. <cm...@us...> - 2006-07-07 22:32:19
|
User: cmicali
Date: 06/07/07 15:32:17
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
AddInSettings.cs AndroMDA.VS80AddIn.AddIn
AndroMDA.VS80AddIn.csproj AssemblyInfo.cs
ConfigFile.cs Connect.cs MDAProject.cs
MDASolutionManager.cs MavenProxy.cs
Resource1.Designer.cs Resource1.resx
SettingsManager.cs VS80AddIn.cs
WizardSolutionProcessor.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
AboutCommand.cs AddInCommandBase.cs
AndroMDALogoCommand.cs
CreateEntityVOConvertorCommand.cs
GenerateCodeCommand.cs OpenModelCommand.cs
ReloadMDAConfigCommand.cs ResyncCommand.cs
RunSchemaExportCommand.cs
RunSolutionWizardCommand.cs StopCommand.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
AboutDialog.cs AboutOptionsPage.cs AddInWelcome.cs
ExternalToolsOptionsPage.cs
GeneralOptionsPage.Designer.cs
GeneralOptionsPage.cs MDAOptionPageProperties.cs
MDAProjectSetupControl.cs MDASolutionWizard.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Utils
AddInUtils.cs AsyncOperation.cs CodeModelUtils.cs
FileUtils.cs VSExternalToolEventArgs.cs
VSExternalToolProxy.cs VSSolutionUtils.cs
ValidationUtils.cs
Added: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands
PropertyMapperCommand.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Dialogs
PropertyMapperDialog.Designer.cs
PropertyMapperDialog.cs PropertyMapperDialog.resx
ScrollableListView.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Resources
arrow_right.png arrow_right1.png link_add.png
Log:
- Copyright updates
- Added property mapper
- Updated options to use checkbox listview
- Fixed bug with unsatisified dependencies prompt
- Added more configuration around display and behavior
Revision Changes Path
No revision
No revision
No revision
No revision
1.9 +19 -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.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- AddInSettings.cs 15 Jun 2006 03:29:32 -0000 1.8
+++ AddInSettings.cs 7 Jul 2006 22:32:14 -0000 1.9
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
@@ -70,6 +70,18 @@
set { m_settings.SetBool("AMDAFirstRun", value); }
}
+ public bool PromptToGenerateOnBuildIfFilesOutOfDate
+ {
+ get { return m_settings.GetBool("AMDABdPrmptO", true); }
+ set { m_settings.SetBool("AMDABdPrmptO", value); }
+ }
+
+ public bool PromptToGenerateOnBuildIfSolutionNotSynched
+ {
+ get { return m_settings.GetBool("AMDABdPrmptS", false); }
+ set { m_settings.SetBool("AMDABdPrmptS", value); }
+ }
+
public int AddInBuild
{
get
@@ -103,6 +115,12 @@
set { m_settings.SetBool("AMDARIHdnFl", value); }
}
+ public bool ShowResyncButton
+ {
+ get { return m_settings.GetBool("AMDARShBtn", false); }
+ set { m_settings.SetBool("AMDARShBtn", value); }
+ }
+
#endregion
#region External tool settings
1.4 +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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AndroMDA.VS80AddIn.AddIn 30 May 2006 17:36:21 -0000 1.3
+++ AndroMDA.VS80AddIn.AddIn 7 Jul 2006 22:32:14 -0000 1.4
@@ -7,7 +7,7 @@
<Addin>
<FriendlyName>AndroMDA Visual Studio 2005 Add-In</FriendlyName>
<Description>Add-In for Visual Studio 2005 that makes working with AndroMDA easier.</Description>
- <AboutBoxDetails>For more information, see the AndroMDA web site at http://www.andromda.org/.</AboutBoxDetails>
+ <AboutBoxDetails>For more information see the AndroMDA web site at http://www.andromda.org/</AboutBoxDetails>
<AboutIconData>0000010006002020100000000000E8020000660000001010100000000000280100004E0300002020000001000800A8080000760400001010000001000800680500001E0D00002020000001002000A8100000861200001010000001002000680400002E2300002800000020000000400000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF001111111111111111111111111111111111111111111111111111111000001111111111111111111111111110ABA01111111111111111111111111110BAB01111111111111111111111111110ABA01111111111110000000000F00000BAB00000111111118888888888F0ABABABABABA0111111118F77777777F0BABABABABAB0111111118F77777777F0ABABABABABA0111111118F77777777F00000BAB00000110001118F77777777FFFFF0ABA01111108880118F777777777777F0BAB01111887788008F777777777777F0ABA011118FF770778F777777777777F0000011118FFF78088F777777777777FFFFFF111118FF70118F7777777777777777801111118881118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118FFFFFFFFFFFFFFFFF801111111111118888888888888888888011111111111111111870111118701111111111111111111118F0111118F011111111111111111111108011111080111111111111111111110808011108080111111111111111111877788018777880111111111111111118FF778018FF7780111111111111111118FFF78018FFF7801111111111111111118FF701118FF7011111111111111111111777111117771111111111111111111111111111111111111111FFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFF000000FF000000FF000000FF000000FF000000C700000F8300000F0000000F0000000F0000000F8300000FC700000FFF00000FFF00000FFF00000FFF00000FFF00000FFFF8F8FFFFF8F8FFFFF8F8FFFFF0707FFFE0203FFFE0203FFFE0203FFFF0707FFFF8F8FFFFFFFFFF2800000010000000200000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF0011111111111111111111111111100011111111111110A011111111111000B00011110000F0ABABA011118F88F000B00011118F77FFF0A01170718F7777F000110F008F7777FFFF1170718F777777801111118FFFFFFF801111118888888880111111111101111111111111170711111111111110F01111111111111707111111FFFF1111FFE37777FFE3ABABFF80ABA0F0001111F0007777F0030000100300000003011110037777F003FFF0F0031111FF7F8011FE3F7777FE3F77F0FE3F1111280000002000000040000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0C0CF50CF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0D3938350CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD303939380DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD11395D390CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD35353535356139393110310D30FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD39666162616161613939393811FDFDFDFDFDFDFDFDFDFD3231073231323132083D858A61666261616161393935FDFDFDFDFDFDFDFDFD5E080909820982838608398A8A8A856165626161613D35FDFDFDFDFDFDFDFD82B3AF08080808080808AB39393939398A86613935353535FDFDFDFDFDFDFDFD86D1F6AFAFAFAFAF08AF0808D408D4398A6586390886FDFDFD5A073632FDFDFD86B3F6F6F6AFF6AFAFAFAF08AB0808398A8A8A39D432FDFD8286D4825A35FDFD82FFF6AFF6F6AFF6AF08D1AF08AFD43D8A8A8A610831FDFD5EFFAF088232363286FFFFF6F6AFF6AFF6AFAF08AF08085D61613D5DD4F5FDFD82F6F6AF085A825E82FFFFFFFFF6D1F6AFF6AFF6AFAFAF080808D408D431FDFD86D4FFFF095EFDFD09FFFFFFFFFFF6B3F6F6AFAFD108AFAFAF08AB09860DFDFDFD08825E86FDFDFD82FFFFFFFFFFFFF6F6AFF6F6AFF6AF08D1AF08088232FDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFF6AFF6AFF6AFAF08AF088331FDFDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFFFF6F6AFF6AFAFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFD86828682825EF75E5E5E5A5E5A5A07360736FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5E31FDFDFDFDFDFD5E31FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8232FDFDFDFDFDFD8232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5A360732FDFDFDFD5A360732FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8286D4823607FDFD8286D4823607FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFAF088232FDFD5EFFAF088232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF7D1FFAF0807FDFDF7D1FFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0808FFFF095EFDFD0808FFFF095EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0982F786FDFDFDFD0982F786FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FFC00000FF800000FF000000FF000003870000030300000300000003000000030300000387000003FF000003FF800007FFC0000FFFFCFCFFFFFCFCFFFFF8787FFFF0303FFFF0303FFFF0303FFFF0303FFFF8787FFFFFFFFFFFFFFFFF280000001000000020000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD353535FDFDFDFDFDFDFDFDFDFDFDFDFD356535FDFDFDFDFDFDFDFDFDFDFD39393985351111FDFDFDFDFDFDFDFDFD398A8A8A8A8935FDFDFDFDFDFD3131823D39398A393535FDFDFDFDFD32AF820808AB3DB239FDFDFDFDF5FDFD5AF6AFAFAF08393939FDFDFD5EFFF5F55EFFF6F6AFF6AF0886FDFDFDFD5EFDFD5EFFFFF6F6AFAFD4F5FDFDFDFDFDFDFDFDF75E5E5A5A0731FDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFDFDFFC7FDFDFFC7FDFDFF01FDFDFF01FD39F8016261F0076139B00738110007FDFDB007FDFDF80F3231FF7F3132FF7F083DFE3F6166FF7F6161FFFF39352800000020000000400000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002E5B35FC295231FF274F2FFF264D2EFF27502FFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000306138FE329A4FFF2C9649FF259244FF2A5432FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000356A3DFC3FA259FF389D54FF319A4EFF2E5D36FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000397341FE4DAB66FF45A65FFF3DA158FF316439FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045874CFF43854BFF42824AFF407E47FF3F7C46FF5BB471FF53AF6AFF4BAA64FF356B3DFF34683CFF33673BFF326439FF306038FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000519F58FF85CF94FF7FCA8FFF77C689FF70C183FF69BD7DFF61B876FF59B370FF51AE6AFF49A963FF42A55CFF3B9F56FF387040FF00000000000000000000000000000000000000000000000000000000000000000000000089715F4689715FFF866E5BFF846B59FF816855FF7E6552FF7B624FFF79604CFF846E5CFFCAC1B9FF55A85DFF8FD59CFF8AD198FF84CD93FF7DCA8EFF76C688FF6EC082FF67BB7CFF5FB775FF58B26EFF50AD67FF48A861FF3E7A46FF000000000000000000000000000000000000000000000000000000000000000089715F46AE998AFFD2C0B6FFD0BDB3FFCEBBB1FFCCB9AEFFCBB6ABFFCAB4A9FFC7B2A6FFCCB8ADFFD4C4BCFF5AB061FF97DAA3FF93D8A0FF8ED49CFF88D097FF83CC92FF7BC98CFF75C487FF6DC081FF65BB7AFF5EB673FF56B16DFF43854AFF0000000000000000000000000000000000000000000000000000000000000000C3AFA2FFF3EFECFFE6DEDAFFE0D4CEFFDFD2CAFFDDCEC7FFDACCC3FFD8C9C1FFD6C6BDFFD8C8C1FFE1D6CFFF59AB60FF58AA5EFF56A75DFF55A65DFF57AA5EFF8DD39BFF87CF97FF81CC91FF4F9B57FF4B9352FF498D50FF478C4FFC46894DFC0000000000000000000000000000000000000000000000000000000000000000C4B0A3FFF7F3F1FFF5F0EEFFF2EDEBFFEFEAE7FFEEE6E3FFEBE3DFFFE8DFDBFFE6DCD6FFE4D8D2FFE1D4CEFFDED0CAFFDCCDC6FFD9C9C2FFD6C6BDFF57AB5EFF95D9A2FF91D69EFF8CD29AFF519E58FFDED2CBFFC4BAB2FF0000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000C5B1A4FFF9F7F5FFF7F4F3FFF5F2EFFFF3EEECFFF0EBE8FFEFE8E4FFEDE4E1FFEAE1DDFFE7DDD8FFE4DAD4FFE2D7D0FFDFD3CCFFDCCEC8FFDACBC3FF5AAE62FF99DBA5FF99DAA4FF94D8A2FF54A45BFFDFD4CEFF846E5EFF0000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000C5B2A4FFFBFAF9FFF9F8F6FFF8F5F3FFF6F3F0FFF4EFEEFFF2ECEAFFF0EAE6FFEEE6E2FFEBE3DEFFE8DFDAFFE5DBD6FFE3D8D2FFE0D4CDFFDDD0C9FF5DB564FF99DBA5FF99DBA5FF99DBA5FF69B570FFDDD1CAFF69503BFF0000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8866E5BFF846B59FFC6B2A5FFFDFDFDFFFCFAFAFFFBF9F8FFF9F6F5FFF7F3F2FFF5F0EEFFF2EEECFFF0EBE8FFEEE7E4FFECE4E0FFE9E1DCFFE6DDD7FFE4D9D4FFE2D6D0FF5DB263FF62BF69FF62BF69FF61BE68FF6AB671FFDED2CBFF6C523EFF0000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8C7B1A6FFB39A8AFFC6B3A5FFFFFFFFFFFFFDFEFFFDFBFBFFFBFAF9FFF9F8F6FFF7F5F3FFF5F2F0FFF3EFEDFFF1ECE9FFEFE9E5FFEDE6E2FFEBE3DEFFE8DFDAFFE6DBD5FFE2D8D2FFE0D4CDFFDDCFC9FFDFD1CBFFDED2CBFFDDCFC7FF6F5541FF0000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000C7B3A6FFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFDFFFCFBFAFFFAF9F8FFF8F6F5FFF7F3F2FFF5F0EFFFF2EDEAFFF0EAE7FFEEE7E3FFEBE4DFFFE9E0DCFFE6DDD7FFE4D9D3FFE1D5CFFFDFD1CBFFD0BDB4FFC5B0A4FF725945FF0000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000C7B5A7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFEFDFFFCFCFBFFFBFAF8FFFAF7F6FFF7F5F2FFF6F2EFFFF3EFEDFFF2ECE9FFEFE9E5FFECE5E1FFEAE2DDFFE7DED9FFE5DBD5FFE2D7D1FFD3C2BAFFC8B3A8FF755C49FF00000000000000000000000000000000000000000000000000000000000000000000000000000000C8B5A8CAFFFFFFDAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFCFFFCFBFAFFFAF8F8FFF8F6F4FFF6F3F1FFF5F0EEFFF2EDEAFFF0EAE6FFEDE6E3FFEBE4DFFFE9E0DBFFE6DCD7FFDCCFC8FFCBB7ABFF795F4CFF0000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2FFFFFFCDFFFFFFEAFFFFFFF4FFFFFFFFFFFFFFFFFFFFFFFFFEFDFDFFFDFCFBFFFBFAF9FFFAF6F5FFF7F4F3FFF5F2EFFFF3EEECFFF1EBE8FFEFE8E5FFECE5E1FFEAE1DDFFE4DAD5FF866E5CFF866E5C46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2C3AFA2D3C0AD9EE8BDA99CFFBBA698FFB7A495FFB5A091FFB19C8DFFAE9989FFAB9585FFA79281FFA48E7DFFA08A7AFF9C8675FF988271FF957E6DFF917A68FF8A7260FF866E5C460000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B39A8AFF846B59FF000000000000000000000000000000000000000000000000B39A8AFF846B59FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C082685531000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF80000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF80000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB3100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FF800000FF000000FF000000FF000003030000030300000300000003000000030300000303000003FF000003FF000003FF800007FFFCFCFFFFFCFCFFFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFFFFFFFFFFFFFFF2800000010000000200000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFF4643854BFF407D47FF3B7643FFFFFFFF46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000488E50FF7BC88DFF3F7D47FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055A65CFF519E58FF4D9554FF8AD29AFF43854BFF407E47FF3C7643FF00000000000000000000000000000000000000000000000000000000000000000000000059AE60FFA4E3B2FF9FE0ADFF9ADCA8FF94D9A3FF8ED59FFF407E47FF000000000000000000000000000000000000000000000000755B46FF6E5541FFC0B5ACFF5CB463FF59AE60FF55A65CFFAAE7B7FF4C9653FF478D4FFF44854BFF00000000000000000000000000000000FFFFFF31856D5AFFEDE6E3FFBFA79AFFD5C6BDFFD7C8C0FFD3C5BCFF59AE60FFB9F0C3FF509E58FF0000000000000000000000006348333B634833FF6348333BFFFFFF6A97806FFFF6F2F1FFF2EDEAFFEDE6E3FFE8E0DCFFE4D9D3FF5DB464FF59AE60FF55A75CFF000000000000000000000000AE9A8BFFFFFFFFFF634833FF634833FFA99484FFFDFBFCFFF9F7F7FFF6F3F0FFF2EDEAFFEDE7E3FFEBE3E0FFD9CEC7FFC4BAB2FF0000000000000000000000006348333BAE9A8BFF6348333BFFFFFF79B29D8EFFFFFFFFFFFCFCFBFFFAF8F7FFF6F2F1FFF2EDEAFFE9E0DBFFDFD2CBFF694E3AFF000000000000000000000000000000000000000000000000FFFFFF4600000000B6A193FFAE9A8BFFA79181FF9F8979FF97806FFF876F5DFF785F4CFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000634833FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333F634833FF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000AE9A8BFFFFFFFFFF634833FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333FAE9A8BFF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFF0000FF830000FFC70000FF010000FF010000F8010000E0070000000700000007000000070000E80F0000FF7F0000FE3F0000FE3F0000FE3F0000FFFF0000</AboutIconData>
<Assembly>AndroMDA.VS80AddIn.dll</Assembly>
<FullClassName>AndroMDA.VS80AddIn.Connect</FullClassName>
1.15 +17 -0 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.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- AndroMDA.VS80AddIn.csproj 12 Jun 2006 00:11:18 -0000 1.14
+++ AndroMDA.VS80AddIn.csproj 7 Jul 2006 22:32:14 -0000 1.15
@@ -57,6 +57,7 @@
<Compile Include="Commands\AddInCommandBase.cs" />
<Compile Include="Commands\AndroMDALogoCommand.cs" />
<Compile Include="Commands\CreateEntityVOConvertorCommand.cs" />
+ <Compile Include="Commands\PropertyMapperCommand.cs" />
<Compile Include="Commands\RunSchemaExportCommand.cs" />
<Compile Include="Commands\ReloadMDAConfigCommand.cs" />
<Compile Include="Commands\OpenModelCommand.cs" />
@@ -109,6 +110,15 @@
<Compile Include="Dialogs\MDASolutionWizard.designer.cs">
<DependentUpon>MDASolutionWizard.cs</DependentUpon>
</Compile>
+ <Compile Include="Dialogs\PropertyMapperDialog.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Dialogs\PropertyMapperDialog.Designer.cs">
+ <DependentUpon>PropertyMapperDialog.cs</DependentUpon>
+ </Compile>
+ <Compile Include="Dialogs\ScrollableListView.cs">
+ <SubType>Component</SubType>
+ </Compile>
<Compile Include="MavenProxy.cs" />
<Compile Include="MDAProject.cs" />
<Compile Include="MDASolutionManager.cs" />
@@ -251,6 +261,10 @@
<DependentUpon>MDASolutionWizard.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Dialogs\PropertyMapperDialog.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>PropertyMapperDialog.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Resource1.resx">
<SubType>Designer</SubType>
<Generator>ResXFileCodeGenerator</Generator>
@@ -283,6 +297,9 @@
</Content>
<Content Include="AddIn.ico" />
<None Include="Resources\indicator_arrows.gif" />
+ <None Include="Resources\arrow_right1.png" />
+ <None Include="Resources\arrow_right.png" />
+ <None Include="Resources\link_add.png" />
<Content Include="Resources\mda\src\uml\empty.model.membership.xml" />
<None Include="Resources\rightbox.bmp" />
<None Include="Resources\orange.bmp" />
1.6 +2 -2 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.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- AssemblyInfo.cs 28 Apr 2006 16:07:24 -0000 1.5
+++ AssemblyInfo.cs 7 Jul 2006 22:32:14 -0000 1.6
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
@@ -18,7 +18,7 @@
[assembly: AssemblyDescription("Add-In for Visual Stuio 2005 to integrate the AndroMDA toolchain.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("AndroMDA.org")]
-[assembly: AssemblyProduct("")]
+[assembly: AssemblyProduct("AndroMDA")]
[assembly: AssemblyCopyright("(c) 2006 AndroMDA.org")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
1.2 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/ConfigFile.cs
Index: ConfigFile.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/ConfigFile.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- ConfigFile.cs 18 Apr 2006 16:14:43 -0000 1.1
+++ ConfigFile.cs 7 Jul 2006 22:32:14 -0000 1.2
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
1.3 +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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Connect.cs 2 May 2006 21:33:42 -0000 1.2
+++ Connect.cs 7 Jul 2006 22:32:14 -0000 1.3
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
1.4 +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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- MDAProject.cs 11 Jun 2006 15:35:24 -0000 1.3
+++ MDAProject.cs 7 Jul 2006 22:32:14 -0000 1.4
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
1.14 +150 -99 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.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- MDASolutionManager.cs 15 Jun 2006 03:29:32 -0000 1.13
+++ MDASolutionManager.cs 7 Jul 2006 22:32:14 -0000 1.14
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
@@ -131,6 +131,10 @@
{
return false;
}
+ if (m_addInSettings.PromptToGenerateOnBuildIfSolutionNotSynched)
+ {
+ return IsSolutionSynchronizedWithFileSystem();
+ }
return true;
}
}
@@ -164,6 +168,8 @@
#endregion
+ #region Constructors
+
public MDASolutionManager(DTE applicationObject, AddInSettings addInSettings)
{
m_applicationObject = applicationObject;
@@ -172,7 +178,11 @@
m_mavenProxy.Completed += new EventHandler(m_mavenProxy_Completed);
}
- public void OnSolutionOpened()
+ #endregion
+
+ #region Initialization
+
+ public void InitializeSolution()
{
m_solutionIsUsingMDA = MDAConfigFilesExist(m_applicationObject.Solution);
m_enabled = false;
@@ -250,7 +260,7 @@
if (m_commonProject == null) { errorMessage += "common "; }
errorMessage += "project";
if (m_commonProject == null && m_coreProject == null) errorMessage += "s";
- errorMessage += " could not be found.\nThe AndroMDA add-in is being disabled. Please reload the solution or click Reload MDA Config.";
+ 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");
@@ -266,6 +276,10 @@
}
}
+ #endregion
+
+ #region Build events
+
//BuildEvents
public void OnBuildBegin(EnvDTE.vsBuildScope scope, EnvDTE.vsBuildAction action)
{
@@ -279,7 +293,7 @@
}
else if (action != vsBuildAction.vsBuildActionClean)
{
- if (!AreGeneratedFilesUpToDate)
+ 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);
if (result == System.Windows.Forms.DialogResult.Yes)
@@ -309,6 +323,8 @@
{
}
+ #endregion
+
#region Run schema export methods
public void RunSchemaExport()
@@ -375,7 +391,7 @@
}
else
{
- System.Windows.Forms.MessageBox.Show("You must have an MDA-enabled solution loaded to run Maven.", "Error", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Error);
+ AddInUtils.ShowError("You must have an MDA-enabled solution loaded to run Maven.");
}
}
@@ -422,7 +438,7 @@
{
try
{
- RefreshGeneratedFilesThreadStart();
+ DoRefreshGeneratedFiles();
}
catch (Exception e)
{
@@ -461,7 +477,7 @@
}
}
- public void RefreshGeneratedFilesThreadStart()
+ private void DoRefreshGeneratedFiles()
{
m_progress = 0;
UpdateResyncProgressBar();
@@ -484,21 +500,13 @@
private void ResyncFolder(ProjectItem item, string folderPath, string projectName)
{
- if (item == null)
- {
- return;
- }
-
- /*
- if (!System.IO.Directory.Exists(folderPath))
- {
- item.Remove();
- return 0;
- }
- */
+ if (item == null) return;
UpdateResyncProgressBar(projectName + "/" + item.Name);
- // Get the UI nodes so we can collapse the projects
+
+ // Get the UI nodes from the solution explorer
+ // so we can collapse the project trees and make it look neat
+ // when we are finished (it's faster when they are closed too)
UIHierarchy solutionExplorer = (UIHierarchy)m_applicationObject.Windows.Item(Constants.vsext_wk_SProjectWindow).Object;
UIHierarchyItem uiCommonProject = null;
UIHierarchyItem uiCoreProject = null;
@@ -518,16 +526,25 @@
CollapseProject(uiCommonProject);
UpdateResyncProgressBar("Getting file list for " + projectName + "/" + item.Name);
+
+ // Get the list of files in the filesystem
ArrayList filesystemFileList = GetFileListFromFilesystem(folderPath);
+ // Get the list of files in the solution tree
ArrayList solutionTreeFileList = GetFileListFromProjectTree(item);
+ // Generate a hash for the filesystem list
int filesHash = GetArrayListHashCode(filesystemFileList);
+ // Generate a hash for the solution tree list
int solutionHash = GetArrayListHashCode(solutionTreeFileList);
+
+ // If the hash codes are the same, we don't need to do a resync
if (filesHash == solutionHash)
{
UpdateResyncProgressBar("Files have not changed since last resync: " + projectName + "/" + item.Name);
return;
}
+ // The hash codes are different, so we need to sync the solution tree
+ // to the filesystem
UpdateResyncProgressBar("Removing all files from " + projectName + "/" + item.Name);
// Remove all files from the project
@@ -541,6 +558,7 @@
// Add the files from the filesystem into the solution
// The filesystemFileList has already been filtered for ignored items
+ // Also note that this list contains all files in all subdirectories
int fileNum = 0;
foreach (string file in filesystemFileList)
{
@@ -565,6 +583,38 @@
}
+ private bool IsSolutionSynchronizedWithFileSystem()
+ {
+ // Check common/src
+ if (!IsSolutionSynchronizedWithFileSystem(m_commonProject.ManualPathProjectItem, m_commonProject.ManualPath))
+ return false;
+ // Check common/target
+ if (!IsSolutionSynchronizedWithFileSystem(m_commonProject.GeneratedPathProjectItem, m_commonProject.GeneratedPath))
+ return false;
+ // Check core/src
+ if (!IsSolutionSynchronizedWithFileSystem(m_coreProject.ManualPathProjectItem, m_coreProject.ManualPath))
+ return false;
+ // Check core/target
+ if (!IsSolutionSynchronizedWithFileSystem(m_coreProject.GeneratedPathProjectItem, m_coreProject.GeneratedPath))
+ return false;
+ return true;
+ }
+
+ private bool IsSolutionSynchronizedWithFileSystem(ProjectItem item, string folderPath)
+ {
+ // Get the list of files in the filesystem
+ ArrayList filesystemFileList = GetFileListFromFilesystem(folderPath);
+ // Get the list of files in the solution tree
+ ArrayList solutionTreeFileList = GetFileListFromProjectTree(item);
+ // Generate a hash for the filesystem list
+ int filesHash = GetArrayListHashCode(filesystemFileList);
+ // Generate a hash for the solution tree list
+ int solutionHash = GetArrayListHashCode(solutionTreeFileList);
+
+ // If the hash codes are the same, we don't need to do a resync
+ return filesHash == solutionHash;
+ }
+
private int GetArrayListHashCode(ArrayList list)
{
int hashCode = 0;
@@ -632,6 +682,7 @@
private ArrayList GetFileListFromProjectTree(ProjectItem item)
{
ArrayList filesList = new ArrayList();
+ if (item == null) return filesList;
if (item.Kind == EnvDTE.Constants.vsProjectItemKindPhysicalFile)
{
for (short i = 1; i <= item.FileCount; i++)
@@ -734,45 +785,13 @@
#region Statistics methods
- public class SolutionStatistic
- {
- public enum Group { CodeStatistics, FileStatistics };
- private string m_name;
- private string m_value;
- private Group m_group;
-
- public Group StatGroup
- {
- get { return m_group; }
- set { m_group = value; }
- }
-
- public string Value
- {
- get { return m_value; }
- set { m_value = value; }
- }
-
- public string Name
- {
- get { return m_name;}
- set { m_name = value;}
- }
- public SolutionStatistic(string name, string value, Group group)
- {
- m_name = name;
- m_value = value;
- m_group = group;
- }
- }
-
public ArrayList GetSolutionStatistics()
{
ArrayList stats = new ArrayList();
if (IsEnabled)
{
Hashtable files = CollectFiles(m_coreProject.GeneratedPathProjectItem);
- AddHashtable(files, CollectFiles(m_commonProject.GeneratedPathProjectItem));
+ MergeHashtable(files, CollectFiles(m_commonProject.GeneratedPathProjectItem));
stats.Add(new SolutionStatistic("Files Generated", files.Count.ToString("N0"), SolutionStatistic.Group.FileStatistics));
stats.Add(new SolutionStatistic("Lines of Code Generated", GetTotalLOC(files).ToString("N0"), SolutionStatistic.Group.FileStatistics));
@@ -888,12 +907,12 @@
}
foreach(ProjectItem subitem in item.ProjectItems)
{
- AddHashtable(list, CollectFiles(subitem));
+ MergeHashtable(list, CollectFiles(subitem));
}
return list;
}
- private void AddHashtable(Hashtable dst, Hashtable src)
+ private void MergeHashtable(Hashtable dst, Hashtable src)
{
foreach (string key in src.Keys)
{
@@ -917,6 +936,38 @@
public FileType type;
}
+ public class SolutionStatistic
+ {
+ public enum Group { CodeStatistics, FileStatistics };
+ private string m_name;
+ private string m_value;
+ private Group m_group;
+
+ public Group StatGroup
+ {
+ get { return m_group; }
+ set { m_group = value; }
+ }
+
+ public string Value
+ {
+ get { return m_value; }
+ set { m_value = value; }
+ }
+
+ public string Name
+ {
+ get { return m_name; }
+ set { m_name = value; }
+ }
+ public SolutionStatistic(string name, string value, Group group)
+ {
+ m_name = name;
+ m_value = value;
+ m_group = group;
+ }
+ }
+
#endregion
}
1.5 +2 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MavenProxy.cs
Index: MavenProxy.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/MavenProxy.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- MavenProxy.cs 15 Jun 2006 03:29:32 -0000 1.4
+++ MavenProxy.cs 7 Jul 2006 22:32:14 -0000 1.5
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
@@ -96,7 +96,7 @@
void MavenProxy_ProcessStdErr(ref string text, ref bool cancelOutput)
{
ProcessOutput(ref text, ref cancelOutput);
- if (text.Contains("The build cannot continue because of the following unsatisfied dependency"))
+ if (text.Contains("unsatisfied dependency") || text.Contains("unsatisfied dependencies"))
{
m_mavenStatus = MavenStatus.UnsatisfiedDependency;
}
1.8 +21 -0 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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- Resource1.Designer.cs 12 Jun 2006 00:11:18 -0000 1.7
+++ Resource1.Designer.cs 7 Jul 2006 22:32:14 -0000 1.8
@@ -60,6 +60,20 @@
}
}
+ internal static System.Drawing.Bitmap arrow_right {
+ get {
+ object obj = ResourceManager.GetObject("arrow_right", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ internal static System.Drawing.Bitmap arrow_right1 {
+ get {
+ object obj = ResourceManager.GetObject("arrow_right1", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to bin
///obj
@@ -212,6 +226,13 @@
}
}
+ internal static System.Drawing.Bitmap link_add {
+ get {
+ object obj = ResourceManager.GetObject("link_add", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to <project default="mda"
/// xmlns:ant="jelly:ant"
1.8 +25 -16 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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- Resource1.resx 12 Jun 2006 00:11:18 -0000 1.7
+++ Resource1.resx 7 Jul 2006 22:32:14 -0000 1.8
@@ -133,8 +133,8 @@
<data name="lib_NHibernate_Caches_Prevalence_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\NHibernate.Caches.Prevalence.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="lib_Iesi_Collections_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\Lib\Iesi.Collections.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="SchemaExport_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\SchemaExport\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="nhibernate_config" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\nhibernate.config;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
@@ -145,9 +145,6 @@
<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="mda_src_uml_empty_model_membership_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\mda\src\uml\empty.model.membership.xml;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>
</data>
@@ -157,18 +154,27 @@
<data name="maven_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\maven.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="SchemaExport_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\SchemaExport\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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>
+ <data name="arrow_right1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\arrow_right1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="web_web_config_rolesection" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Web\web.config.rolesection;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="mda_conf_andromda_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mda\conf\andromda.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</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="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>
@@ -181,6 +187,9 @@
<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>
</data>
+ <data name="lib_Iesi_Collections_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\Lib\Iesi.Collections.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name="lib_log4net_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\log4net.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -196,9 +205,6 @@
<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="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\NHibernate.Caches.SysCache.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@@ -211,8 +217,8 @@
<data name="web_web_config_membershipsection" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Web\web.config.membershipsection;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="mda_maven_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>Resources\mda\maven.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="mda_src_uml_empty_model_membership_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\mda\src\uml\empty.model.membership.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="web_bin_cvsignore" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Web\Bin\cvsignore;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -220,6 +226,9 @@
<data name="core_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Core\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
+ <data name="mda_maven_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\mda\maven.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
<data name="common_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Common\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
@@ -232,8 +241,8 @@
<data name="lib_NHibernate_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\NHibernate.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <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 name="arrow_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="lib_HashCodeProvider_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Lib\HashCodeProvider.dll;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -244,7 +253,7 @@
<data name="mda_project_xml" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\mda\project.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</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 name="link_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>Resources\link_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
1.2 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/SettingsManager.cs
Index: SettingsManager.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/SettingsManager.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- SettingsManager.cs 18 Apr 2006 16:14:43 -0000 1.1
+++ SettingsManager.cs 7 Jul 2006 22:32:14 -0000 1.2
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
1.11 +5 -4 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.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- VS80AddIn.cs 15 Jun 2006 03:29:32 -0000 1.10
+++ VS80AddIn.cs 7 Jul 2006 22:32:14 -0000 1.11
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
@@ -20,7 +20,7 @@
public class VS80AddIn
{
- public const string ADD_IN_VERSION = "1.3.1";
+ public const string ADD_IN_VERSION = "1.4";
#region Constants
@@ -89,6 +89,7 @@
m_commands.Add(new OpenModelCommand());
m_commands.Add(new AboutCommand());
m_commands.Add(new CreateEntityVOConvertorCommand());
+ m_commands.Add(new PropertyMapperCommand());
// Set the context for each command
foreach (AddInCommandBase cmd in m_commands)
{
@@ -399,7 +400,7 @@
{
if (m_solutionManager != null)
{
- m_solutionManager.OnSolutionOpened();
+ m_solutionManager.InitializeSolution();
}
}
1.12 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs
Index: WizardSolutionProcessor.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/WizardSolutionProcessor.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- WizardSolutionProcessor.cs 11 Jun 2006 22:20:28 -0000 1.11
+++ WizardSolutionProcessor.cs 7 Jul 2006 22:32:14 -0000 1.12
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
1.6 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AboutCommand.cs
Index: AboutCommand.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Commands/AboutCommand.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- AboutCommand.cs 30 May 2006 17:36:21 -0000 1.5
+++ AboutCommand.cs 7 Jul 2006 22:32:15 -0000 1.6
@@ -1,6 +1,6 @@
// AndroMDA Visual Studio 2005 Add-In
-// (c)2006 Sapient Corporation
+// (c)2006 AndroMDA.org
#region Using statements
1.8 ...
[truncated message content] |
|
From: Eric C. <ecr...@us...> - 2006-07-06 15:20:58
|
User: ecrutchfield
Date: 06/07/06 08:20:54
Modified: andromda-cs pom.xml
Log:
turn off testing until contrib and andromdaplugins are synchronized
Revision Changes Path
1.4 +1 -1 cartridges/andromda-cs/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- pom.xml 22 Jun 2006 20:29:50 -0000 1.3
+++ pom.xml 6 Jul 2006 15:20:54 -0000 1.4
@@ -66,7 +66,7 @@
</plugins>
</build>
<properties>
- <maven.test.skip>false</maven.test.skip>
+ <maven.test.skip>true</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: Vance K. <va...@us...> - 2006-07-05 02:46:29
|
User: vancek
Date: 06/07/04 19:46:27
Modified: andromda-ejb3/src/site/xdoc installation.xml
andromda-ejb3/src/site site.xml
Added: andromda-ejb3/src/site/resources/images andromdapp.gif
andromda-ejb3/src/site/xdoc project.xml
Log:
added project generator docs
Revision Changes Path
1.1 cartridges/andromda-ejb3/src/site/resources/images/andromdapp.gif
<<Binary file>>
1.3 +2 -1 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- installation.xml 17 Jun 2006 12:02:21 -0000 1.2
+++ installation.xml 5 Jul 2006 02:46:27 -0000 1.3
@@ -83,7 +83,8 @@
</section>
<section name="Next">
<p>
- To start with EJB 3.0 entity POJOs click <a href="howto1.html">next</a>.
+ Before starting with the EJB3 howtos, find out how to generate your
+ <a href="project.html">EJB 3.0 project</a>.
</p>
</section>
</body>
1.1 cartridges/andromda-ejb3/src/site/xdoc/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="iso-8859-1"?>
<document>
<properties>
<author email="va...@us...">Vance Karimi</author>
<title>AndroMDA - EJB3 - Generate the EJB 3.0 Project</title>
</properties>
<body>
<section name="Generate the EJB 3.0 Project">
<p>
Generating your EJB 3.0 project is similar to how you generate any other project using AndroMDA.
You can either use the <b>AndroMDApp generator</b> or <b>Android</b>. Both can be referenced
from <a href="http://www.andromda.org">AndroMDA's web site</a>.
</p>
<p>
Using the AndroMDApp generator, simply run the following command
</p>
<p>
<code>mvn andromdapp:generate</code>
</p>
<p>
And follow the process. The following diagram illustrates how to generate a template
EJB 3.0 project with MySQL, JSF + Facelets, WebService and JBoss Seam enabled.
</p>
<p>
<img src="images/andromdapp.gif"/>
</p>
</section>
<section name="Next">
<p>
Now you are ready to start going through the howtos to model your EJB 3.0 requirements. You
cas start with learning about entity POJOs <a href="howto1.html">here</a>.
</p>
</section>
</body>
</document>
1.18 +1 -0 cartridges/andromda-ejb3/src/site/site.xml
Index: site.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/site.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- site.xml 1 Jul 2006 03:07:39 -0000 1.17
+++ site.xml 5 Jul 2006 02:46:27 -0000 1.18
@@ -18,6 +18,7 @@
<menu name="Overview">
<item name="About EJB3 Cartridge" href="index.html"/>
<item name="Installation" href="installation.html"/>
+ <item name="New Project" href="project.html"/>
</menu>
<menu name="Model">
<item name="Profile" href="profile.html"/>
|
|
From: Vance K. <va...@us...> - 2006-07-04 07:47:07
|
User: vancek
Date: 06/07/04 00:47:07
Modified: andromda-ejb3/src/main/resources/templates/ejb3 DaoBase.vsl
andromda-ejb3/src/changes changes.xml
Log:
fix JIRA EJB-38 - query in DAO base with argument enum type has to set the enum class as the parameter, not the value (name or ordinal)
Revision Changes Path
1.9 +0 -10 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.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- DaoBase.vsl 26 Jun 2006 06:45:12 -0000 1.8
+++ DaoBase.vsl 4 Jul 2006 07:47:06 -0000 1.9
@@ -513,11 +513,6 @@
#* *##set ($argumentValue = "new ${argument.type.wrapperName}($argument.name)")
#* *##else
#* *##set ($argumentValue = "${argument.name}")
-#* *##if ($argument.enumerationTypeOrdinal)
-#* *##set ($argumentValue = "${argumentValue}.ordinal()")
-#* *##elseif ($argument.enumerationTypeString)
-#* *##set ($argumentValue = "${argumentValue}.name()")
-#* *##end
#* *##end
#* *##if ($argument.temporalType)
#* *##set ($argumentValue = "${argumentValue}, javax.persistence.TemporalType.${argument.temporalType}")
@@ -585,11 +580,6 @@
#* *##set ($argumentValue = "new ${argument.type.wrapperName}($argument.name)")
#* *##else
#* *##set ($argumentValue = "${argument.name}")
-#* *##if ($argument.enumerationTypeOrdinal)
-#* *##set ($argumentValue = "${argumentValue}.ordinal()")
-#* *##elseif ($argument.enumerationTypeString)
-#* *##set ($argumentValue = "${argumentValue}.name()")
-#* *##end
#* *##end
#* *##if ($argument.temporalType)
#* *##set ($argumentValue = "${argumentValue}, javax.persistence.TemporalType.${argument.temporalType}")
1.17 +4 -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.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- changes.xml 1 Jul 2006 12:34:30 -0000 1.16
+++ changes.xml 4 Jul 2006 07:47:07 -0000 1.17
@@ -213,6 +213,10 @@
JIRA EJB-37 - Fix problem with service delegate switch statement where the break statement should not be
issued after a return statement.
</action>
+ <action dev="vancek" due-to="sverker" type="fix">
+ JIRA EJB-38 - The query in the DAO base class for finder methods with argument enum type has to set
+ the enum class as the parameter for the querty, not the value (name or ordinal).
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
|
From: Naresh B. <nb...@us...> - 2006-07-03 09:30:46
|
User: nbhatia
Date: 06/07/03 02:30:45
Modified: andromda-cs/src/main/resources/templates/cs Enumeration.vsl
Log:
Rever changes that Eric made because they were breaking previous code.
Revision Changes Path
1.3 +1 -4 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Enumeration.vsl 22 Jun 2006 20:30:25 -0000 1.2
+++ Enumeration.vsl 3 Jul 2006 09:30:44 -0000 1.3
@@ -1,6 +1,3 @@
-#if ($enumeration.literalType.name != "int")
-#set ($enumType = $enumeration.literalType.name)
-#end
// Name: ${enumeration.name}.cs
// license-header cs merge-point
//
@@ -16,7 +13,7 @@
/// <summary>
$enumeration.getDocumentation(" /// ")
/// </summary>
- public enum#if ($stringUtils.isNotBlank($enumType)) :$enumType#end $enumeration.name
+ public enum $enumeration.name
{
#foreach ($literal in $enumeration.literals)
#if ($literal.defaultValue)
|
|
From: Vance K. <va...@us...> - 2006-07-01 12:34:30
|
User: vancek
Date: 06/07/01 05:34:30
Modified: andromda-ejb3/src/main/resources/templates/ejb3
ServiceDelegate.vsl
andromda-ejb3/src/changes changes.xml
Log:
fix JIRA EJB-37 - incorrent break statement after a return in switch
Revision Changes Path
1.6 +2 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceDelegate.vsl
Index: ServiceDelegate.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/ServiceDelegate.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- ServiceDelegate.vsl 14 Jun 2006 04:49:55 -0000 1.5
+++ ServiceDelegate.vsl 1 Jul 2006 12:34:29 -0000 1.6
@@ -78,12 +78,12 @@
{
case LOCAL_VIEW_TYPE:
#if ($operation.returnTypePresent)return #end#**#get${service.name}Local().${operation.name}(${operation.argumentNames});
- break;
+ #if (!$operation.returnTypePresent)break;#end
case REMOTE_VIEW_TYPE:
default:
#if ($operation.returnTypePresent)return #end#**#get${service.name}Remote().${operation.name}(${operation.argumentNames});
- break;
+ #if (!$operation.returnTypePresent)break;#end
}
#* *##elseif ($operation.viewTypeAbsoluteRemote)
#if ($operation.returnTypePresent)return #end#**#get${service.name}Remote().${operation.name}(${operation.argumentNames});
1.16 +26 -13 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.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- changes.xml 27 Jun 2006 11:13:18 -0000 1.15
+++ changes.xml 1 Jul 2006 12:34:30 -0000 1.16
@@ -87,15 +87,15 @@
Always generate a local interface for a session bean if it is a Seam component.
</action>
<action dev="vancek" due-to="tlu" type="fix">
- If a session bean operation is modelled for the local view type interface, a local interface is NOT
- generated. When returning a view type from the EJB3SessionFacade, must lookup all business operations to
+ JIRA EJB-27 - If a session bean operation is modelled for the local view type interface, a local interface is
+ NOT generated. When returning a view type from the EJB3SessionFacade, must lookup all business operations to
determine their view type individually and return a view type for the session bean to accomodate local,
- remote and both. JIRA EJB-27
+ remote and both.
Refactor service delegate templates and introduce a parent base class which all service delegates extend.
Fix problem with exposing only remote operations as webservice endpoints.
</action>
<action dev="vancek" due-to="tlu" type="add">
- Added support for adding ejb-jar elements to the persistence.xml. JIRA EJB-28.
+ JIRA EJB-28 - Added support for adding ejb-jar elements to the persistence.xml.
</action>
<action dev="vancek" due-to="tlu" type="update">
Generate documentation for enumeration literals.
@@ -112,7 +112,7 @@
Remove references to attributes modelled with a @Version annotation (optimistic lock value for entity) in
manageable service components. Initial work removed attribute from getAttributes, but that caused problems
from the manageable web tier action methods create and update. To account for this, allow the attribute as
- arguement to the methods, but do not call the set accessor.
+ argument to the methods, but do not call the corresponding setter.
</action>
<action dev="vancek" type="fix">
Moved the @Version annotation to the entity attribute. It had no effect on the getter method.
@@ -172,26 +172,26 @@
need for the existing overwritten methods in the manageable entity facades.
</action>
<action dev="vancek" due-to="tlu" type="fix">
- Fix erroneous signature of entity constructor where no entity attributes exist but navigable associations
- do exist. JIRA EJB-34
+ JIRA EJB-34 - Fix erroneous signature of entity constructor where no entity attributes exist but navigable
+ associations do exist.
</action>
<action dev="vancek" type="update">
Revert the build back to using the default Java compiler (1.4) - 1.5 isn't supported for the automated
build process for andromda-plugins.
</action>
<action dev="vancek" due-to="tlu" type="add">
- Add support for a select few meta type annotations for attribues in embedded value classes. Need to
- confirm if @Transient, @Version, @Lob and @Basic are supported. @Column, @Temporal and @Enumerated have
- been confirmed to work. JIRA EJB-31
+ JIRA EJB-31 - Add support for a select few meta type annotations for attribues in embedded value classes.
+ Need to confirm if @Transient, @Version, @Lob and @Basic are supported. @Column, @Temporal and @Enumerated
+ have been confirmed to work.
</action>
<action dev="vancek" due-to="tlu" type="add">
- Add support for embedded value object associations as well as attribute overrides. JIRA EJB-32.
+ JIRA EJB-32 - Add support for embedded value object associations as well as attribute overrides.
NOTE: This is still partial support. The association mutators need to be added with appropriate
annotation to the embedded value object base abstract class.
</action>
<action dev="vancek" due-to="tlu" type="fix">
- Fix problem when there are two embedded value objects of the same type in the same entity. Fix for both
- attribute and association overrides. JIRA EJB=33
+ JIRA EJB-33 - Fix problem when there are two embedded value objects of the same type in the same entity.
+ Fix for both attribute and association overrides.
</action>
<action dev="vancek" due-to="tlu" type="update">
JIRA EJB-29 - the implementation class of the embedded value object was unused and the base class was abstract.
@@ -200,6 +200,19 @@
class and the embeddable implementation class is now the defined as the embeddable class using orm.xml rather
than metadata annotation.
</action>
+ <action dev="vancek" due-to="pawel" type="fx">
+ JIRA EJB-36 - Entities and composite primary keys now implement Comparable interface and implement the
+ compareTo method.
+ @org.hibernate.annotations.Sort annotation is only set if the collection interface for an association end
+ is defined as java.util.SortedSet.
+ </action>
+ <action dev="vancek" type="add">
+ Added basic JBoss Seam documentation to site docs.
+ </action>
+ <action dev="vancek" due-to="tlu" type="fix">
+ JIRA EJB-37 - Fix problem with service delegate switch statement where the break statement should not be
+ issued after a return statement.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-07-01 10:13:03
|
User: vancek
Date: 06/07/01 03:13:01
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3AssociationEndFacadeLogicImpl.java
andromda-ejb3/src/main/resources/templates/ejb3
GlobalMacros.vm EntityCompositePK.vsl Entity.vsl
EntityEmbeddable.vsl
andromda-ejb3/src/main/resources/META-INF/andromda
profile.xml
andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip
Log:
fix JIRA EJB-36
entities and composite PK implement Comparable and implement compareTo
@Sort only set if collection interface is SortedSet
Revision Changes Path
1.12 +47 -22 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationEndFacadeLogicImpl.java
Index: EJB3AssociationEndFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationEndFacadeLogicImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- EJB3AssociationEndFacadeLogicImpl.java 26 Jun 2006 14:40:34 -0000 1.11
+++ EJB3AssociationEndFacadeLogicImpl.java 1 Jul 2006 10:13:00 -0000 1.12
@@ -139,7 +139,7 @@
/**
* Value for collections
*/
- private static final String COLLECTION_TYPE_COLLECTION = "collection";
+ private static final String COLLECTION_TYPE_COLLECTION = "bag";
/**
* Stores the valid collection types
@@ -225,6 +225,10 @@
{
getterSetterTypeName = mappings.getTo(UMLProfile.LIST_TYPE_NAME);
}
+ else if (this.isCollection())
+ {
+ getterSetterTypeName = mappings.getTo(UMLProfile.COLLECTION_TYPE_NAME);
+ }
}
else
{
@@ -581,7 +585,36 @@
}
/**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#handleGetCollectionTypeImplementation()
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#
+ * handleGetCollectionTypeImplemenationClass()
+ */
+ protected String handleGetCollectionTypeImplemenationClass()
+ {
+ String collectionTypeImplementationClass = null;
+ if (this.isMany())
+ {
+ if (this.isSet())
+ {
+ collectionTypeImplementationClass = String.valueOf(
+ this.getConfiguredProperty(SET_TYPE_IMPLEMENTATION));
+ }
+ else if (this.isMap())
+ {
+ collectionTypeImplementationClass = String.valueOf(
+ this.getConfiguredProperty(MAP_TYPE_IMPLEMENTATION));
+ }
+ else if (this.isList() || this.isCollection())
+ {
+ collectionTypeImplementationClass = String.valueOf(
+ this.getConfiguredProperty(LIST_TYPE_IMPLEMENTATION));
+ }
+ }
+ return collectionTypeImplementationClass;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#
+ * handleGetCollectionTypeImplementation()
*/
protected String handleGetCollectionTypeImplementation()
{
@@ -589,7 +622,8 @@
}
/**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#handleGetCollectionTypeImplementation(java.lang.String)
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#
+ * handleGetCollectionTypeImplementation(java.lang.String)
*/
protected String handleGetCollectionTypeImplementation(String arg)
{
@@ -597,18 +631,7 @@
if (this.isMany())
{
implementation.append("new ");
- if (this.isSet())
- {
- implementation.append(this.getConfiguredProperty(SET_TYPE_IMPLEMENTATION));
- }
- else if (this.isMap())
- {
- implementation.append(this.getConfiguredProperty(MAP_TYPE_IMPLEMENTATION));
- }
- else if (this.isList() || this.isCollection())
- {
- implementation.append(this.getConfiguredProperty(LIST_TYPE_IMPLEMENTATION));
- }
+ implementation.append(this.getCollectionTypeImplemenationClass());
// set this association end's type as a template parameter if required
if (Boolean.valueOf(String.valueOf(this.getConfiguredProperty(UMLMetafacadeProperties.ENABLE_TEMPLATING)))
@@ -872,7 +895,8 @@
}
/**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#handleGetDefaultCollectionInterface()
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#
+ * handleGetDefaultCollectionInterface()
*/
protected String handleGetDefaultCollectionInterface()
{
@@ -880,15 +904,16 @@
}
/**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#handleIsDefaultCollectionInterfaceSortedSet()
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#
+ * handleIsCollectionInterfaceSortedSet()
*/
- protected boolean handleIsDefaultCollectionInterfaceSortedSet()
+ protected boolean handleIsCollectionInterfaceSortedSet()
{
- boolean isDefaultSortedSet = false;
- if (StringUtils.equals(this.getDefaultCollectionInterface(), EJB3Globals.COLLECTION_INTERFACE_SORTED_SET))
+ boolean isInterfaceSortedSet = false;
+ if (this.getGetterSetterTypeName().startsWith(EJB3Globals.COLLECTION_INTERFACE_SORTED_SET))
{
- isDefaultSortedSet = true;
+ isInterfaceSortedSet = true;
}
- return isDefaultSortedSet;
+ return isInterfaceSortedSet;
}
}
\ No newline at end of file
1.3 +57 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/GlobalMacros.vm
Index: GlobalMacros.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/GlobalMacros.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- GlobalMacros.vm 1 Jun 2006 14:40:46 -0000 1.2
+++ GlobalMacros.vm 1 Jul 2006 10:13:01 -0000 1.3
@@ -7,6 +7,12 @@
## identifier, must call accessor on PK object.
##
#macro (renderEqualsMethod $class $className $attributeSet)
+ /**
+ * Indicates if the argument is of the same type and all values are equal.
+ *
+ * @param object The target object to compare with
+ * @return boolean True if both objects a 'equal'
+ */
public boolean equals(Object object)
{
#**##if ($attributeSet.empty)
@@ -53,6 +59,11 @@
## identifier, must call accessor on PK object.
##
#macro (renderHashCodeMethod $class $attributeSet)
+ /**
+ * Returns a hash code value for the object
+ *
+ * @return int The hash code value
+ */
public int hashCode()
{
#**##if ($attributeSet.empty)
@@ -89,6 +100,11 @@
## identifier, must call accessor on PK object.
##
#macro (renderToStringMethod $class $className $attributeSet)
+ /**
+ * Returns a String representation of the object
+ *
+ * @return String Textual representation of the object displaying name/value pairs for all attributes
+ */
public String toString()
{
#**##if ($attributeSet.empty)
@@ -103,7 +119,7 @@
#* *##foreach ($attribute in $attributeSet)
#* *##set ($attrType = $attribute.type)
sb.append("${sep}#if ($class.compositePrimaryKeyPresent && $attribute.identifier)pk.#end${attribute.name}: ");
- sb.append(#if ($class.compositePrimaryKeyPresent && $attribute.identifier)this.getPk().#end${attribute.getterName}());
+ sb.append(#if ($class.compositePrimaryKeyPresent && $attribute.identifier)this.getPk().#end${attribute.getterName}()#if ($attribute.containsEmbeddedObject).toString()#end);
#* *##set( $sep = ", " )
#* *##end## foreach
sb.append(")");
@@ -111,3 +127,43 @@
#**##end## $attributeSet.empty
}
#end
+##
+## This macro will render the compareTo(Object o) method
+## This is required since each entity implements Comparable<T>
+##
+#macro (renderCompareToMethod $class $className $identifiers)
+ /**
+ * @see java.lang.Comparable#compareTo(T)
+ */
+ public int compareTo($className o)
+ {
+ int cmp = 0;
+#**##if ($identifiers.size() > 1)
+ if (this.getPk() != null)
+ {
+ cmp = this.getPk().compareTo(o.getPk());
+ }
+#**##else
+#* *##set ($identifier = $identifiers.iterator().next())
+ if (this.${identifier.getterName}() != null)
+ {
+ cmp = this.${identifier.getterName}().compareTo(o.${identifier.getterName}());
+ }
+#**##end
+#**##set ($attributes = $class.attributes)
+#**##if (!$attributes.empty)
+ else
+ {
+#* *##foreach ($attribute in $attributes)
+#* *##if (!$attribute.type.primitive && !$attribute.type.arrayType && !$attribute.lob && !$attribute.identifier && !$attribute.containsEmbeddedObject)
+ if (this.${attribute.getterName}() != null)
+ {
+ cmp = (cmp != 0 ? cmp : this.${attribute.getterName}().compareTo(o.${attribute.getterName}()));
+ }
+#* *##end
+#* *##end
+ }
+#**##end
+ return cmp;
+ }
+#end
1.2 +29 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityCompositePK.vsl
Index: EntityCompositePK.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityCompositePK.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- EntityCompositePK.vsl 18 Jan 2006 08:46:04 -0000 1.1
+++ EntityCompositePK.vsl 1 Jul 2006 10:13:01 -0000 1.2
@@ -10,7 +10,8 @@
$entity.getDocumentation(" * ")
*/
@javax.persistence.Embeddable
-public class ${entity.entityCompositePrimaryKeyName} implements java.io.Serializable
+public class ${entity.entityCompositePrimaryKeyName}
+ implements java.io.Serializable, Comparable<${entity.entityCompositePrimaryKeyName}>
{
private static final long serialVersionUID = 1L;
@@ -104,4 +105,31 @@
#**##end
#end
}
+
+ /**
+ * @see java.lang.Comparable#compareTo(T)
+ */
+ public int compareTo(${entity.entityCompositePrimaryKeyName} o)
+ {
+ int cmp = 0;
+#set ($identifiers = $class.identifiers)
+#if (!$identifiers.empty)
+#**##foreach ($identifier in $identifiers)
+#* *##if (!$identifier.type.primitive && !$identifier.type.arrayType && !$identifier.lob && !$identifier.containsEmbeddedObject)
+#* *##if ($velocityCount == 1)
+ if (this.${identifier.getterName}() != null)
+ {
+ cmp = this.${identifier.getterName}().compareTo(o.${identifier.getterName}());
+ }
+#* *##else
+ if (this.${identifier.getterName}() != null)
+ {
+ cmp = (cmp != 0 ? cmp : this.${identifier.getterName}().compareTo(o.${identifier.getterName}()));
+ }
+#* *##end
+#* *##end
+#**##end
+#end
+ return cmp;
+ }
}
\ No newline at end of file
1.20 +2 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Entity.vsl
Index: Entity.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/Entity.vsl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- Entity.vsl 14 Jun 2006 04:55:20 -0000 1.19
+++ Entity.vsl 1 Jul 2006 10:13:01 -0000 1.20
@@ -65,7 +65,7 @@
#end
public#if ($entity.abstract) abstract#end class ${entity.entityName}
extends ${entity.fullyQualifiedEntityEmbeddableName}
- implements java.io.Serializable
+ implements java.io.Serializable, Comparable<${entity.entityName}>
{
/**
@@ -198,4 +198,5 @@
#* *##end
#**##end
#end
+#renderCompareToMethod($entity $entity.entityName $entity.identifiers)
}
\ No newline at end of file
1.37 +11 -19 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
Index: EntityEmbeddable.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -r1.36 -r1.37
--- EntityEmbeddable.vsl 27 Jun 2006 05:20:29 -0000 1.36
+++ EntityEmbeddable.vsl 1 Jul 2006 10:13:01 -0000 1.37
@@ -121,10 +121,15 @@
extends ${entity.generalization.fullyQualifiedName}
#**##end
#end
- implements java.io.Serializable
+##
+## Do not implement Comparable for (implicit or explicitly defined) mapped superclass
+## or for a subclass in an inheritance hierarchy.
+##
+ implements java.io.Serializable#if (!$entity.entityImplementationRequired && !$entity.embeddableSuperclass && !$entity.requiresGeneralizationMapping), Comparable<${entity.entityName}>#end## no newline
#if (!$entity.interfaceAbstractions.empty)
, $entity.implementedInterfaceList
#end
+
{
private static final long serialVersionUID = ${entity.serialVersionUID}L;
@@ -598,7 +603,7 @@
#* *##if ($target.associationCacheEnabled)
@org.hibernate.annotations.Cache(usage = org.hibernate.annotations.CacheConcurrencyStrategy.${target.cacheType})
#* *##end
-#* *##if ($target.defaultCollectionInterfaceSortedSet)
+#* *##if ($target.collectionInterfaceSortedSet)
@org.hibernate.annotations.Sort(type = org.hibernate.annotations.SortType.NATURAL)
#* *##end
#* *##end
@@ -716,7 +721,7 @@
#* *##if ($target.associationCacheEnabled)
@org.hibernate.annotations.Cache(usage = org.hibernate.annotations.CacheConcurrencyStrategy.${target.cacheType})
#* *##end
-#* *##if ($target.defaultCollectionInterfaceSortedSet)
+#* *##if ($target.collectionInterfaceSortedSet)
@org.hibernate.annotations.Sort(type = org.hibernate.annotations.SortType.NATURAL)
#* *##end
#* *##end
@@ -784,26 +789,13 @@
#else
#**##set ($entityName = $entity.entityName)
#end
- /**
- * Indicates if the argument is of the same type and all values are equal.
- *
- * @param object The target object to compare with
- * @return boolean True if both objects a 'equal'
- */
#renderEqualsMethod($entity $entityName $entity.identifiers)
- /**
- * Returns a hash code value for the object
- *
- * @return int The hash code value
- */
#renderHashCodeMethod($entity $entity.identifiers)
- /**
- * Returns a String representation of the object
- *
- * @return String Textual representation of the object displaying name/value pairs for all attributes
- */
#renderToStringMethod($entity $entityName $entity.attributes)
+#if (!$entity.entityImplementationRequired && !$entity.embeddableSuperclass && !$entity.requiresGeneralizationMapping)
+#renderCompareToMethod($entity $entityName $entity.identifiers)
+#end
}
\ No newline at end of file
1.32 +1 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/profile.xml
Index: profile.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/profile.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -w -r1.31 -r1.32
--- profile.xml 26 Jun 2006 06:56:51 -0000 1.31
+++ profile.xml 1 Jul 2006 10:13:01 -0000 1.32
@@ -913,6 +913,7 @@
<value>set</value>
<value>map</value>
<value>list</value>
+ <value>bag</value>
</allowedValues>
</element>
<element name="ASSOCIATION_INDEX">
1.43 +220 -235 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip
<<Binary file>>
|
|
From: Vance K. <va...@us...> - 2006-07-01 03:07:41
|
User: vancek
Date: 06/06/30 20:07:39
Modified: andromda-ejb3/src/site/xdoc howto.xml howto20.xml
andromda-ejb3/src/site site.xml
andromda-ejb3/src/site/fml faq.fml
Added: andromda-ejb3/src/site/xdoc howto21.xml
Log:
basic simple docs
Revision Changes Path
1.22 +10 -0 cartridges/andromda-ejb3/src/site/xdoc/howto.xml
Index: howto.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -r1.21 -r1.22
--- howto.xml 28 Jun 2006 02:58:35 -0000 1.21
+++ howto.xml 1 Jul 2006 03:07:39 -0000 1.22
@@ -249,6 +249,16 @@
</ul>
</p>
</li>
+ <li>
+ <p>
+ <a href="howto21.html">JBoss Seam</a>
+ <ul>
+ <li><p><a href="howto21.html#Seam_Roadmap">Seam Roadmap</a></p></li>
+ <li><p><a href="howto21.html#Project_Generator">Project Generator</a></p></li>
+ <li><p><a href="howto21.html#Seam_Profile">EJB3 Seam Profile</a></p></li>
+ </ul>
+ </p>
+ </li>
</ul>
</p>
<p>
1.6 +6 -0 cartridges/andromda-ejb3/src/site/xdoc/howto20.xml
Index: howto20.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto20.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- howto20.xml 28 Jun 2006 04:54:09 -0000 1.5
+++ howto20.xml 1 Jul 2006 03:07:39 -0000 1.6
@@ -79,5 +79,11 @@
</p>
</subsection>
</section>
+ <section name="Next">
+ <p>
+ For JBoss Seam integration with your EJB 3.0 project, click
+ <a href="howto21.html">here</a> to continue.
+ </p>
+ </section>
</body>
</document>
1.1 cartridges/andromda-ejb3/src/site/xdoc/howto21.xml
Index: howto21.xml
===================================================================
<?xml version="1.0" encoding="iso-8859-1"?>
<document>
<properties>
<author email="va...@us...">Vance Karimi</author>
<title>AndroMDA - EJB3 - JBoss Seam Integration</title>
</properties>
<body>
<section name="JBoss Seam Integration">
<p>
The EJB3 cartridge now has the ability to enable your EJB 3.0 components as Seam components.
This latest addition is work in progress.
</p>
<p>
Here is the initial roadmap for JBoss Seam integration from the forum
</p>
<a name="Seam_Roadmap"/>
<subsection name="Seam Roadmap">
<p>
1. Have a new profile called andromda-profile-seam, as part of the andromdaplugins project
containing all stereotypes and tagged values pertaining to seam components. Projects need to download
and build the artifact and manually load the profile module within their UML model.
</p>
<p>
2. Every entity or session bean which is to be modelled as a Seam component should have an
extra <![CDATA[<<Seam>>]]> stereotype.
</p>
<p>
3. #2 will render the @Name stereotype with the value taken as the class name. Should
provide <code>@andromda.seam.component.name</code> tagged value to override this.
</p>
<p>
4. Provide <code>@andromda.seam.component.scope</code> with enumerated values to set the scope if
required, otherwise use defaults.
</p>
<p>
5. @NotNull on getters is rendered based on attribute multiplicity.
</p>
<p>
6. @Length annotation's max property is taken from
<code>@andromda.persistence.column.length</code> tagged value. To specify a min
length, set the tagged value to x,y where x is min, y is max.
Need to account for this in the facade logic impl.
</p>
<p>
7. @In and @Out annotations for bijection are rendered on attributes defined on
session bean class where <![CDATA[<<In>>]]> and <![CDATA[<<Out>>]]> stereotypes are
modelled respectively. If attribute multiplicity is 0, 0..1, 0..*, define
require property in both annotations. If attribute multiplicity is 1, 1..*
define create property on @In.
</p>
<p>
8. @Create annotation rendered on session bean operation if a
<![CDATA[<<Create>>]]> stereotype is modelled on it.
</p>
<p>
9. @Destroy annotation is rendered on a session bean operation if a
<![CDATA[<<Destroy>>]]> stereotype is modelled on it.
</p>
<p>
10. Provide tag <code>@andromda.seam.validation.invalid.outcome</code> with enumerated
list of values to be set on session bean operations (to render @IfInvalid) such that
Hibernate Validator can validate component state before invoking action listener
session bean operation (for components with @Valid annotations).
<code>@andromda.seam.validation.invalid.refreshEntities</code> can be set to true or
false and if defined, adds the refreshEntities property to the annotation.
</p>
<p>
11. <![CDATA[<<Valid>>]]> stereotype can be modelled on session bean attributes
to render @Valid annotation for validation (see #10).
</p>
<p>
12. Modify andromdapp project generator to ask a further question:
Would you like to use the JBoss Seam application framework?
Only if persistence engine is ejb3, a web interface is required and interface type
is JSF. This will add the jboss-seam artifact as dependency to necessary poms
and include it in the ear for deployment. Perhaps include a property called
seamEnabled in the andromda.xml application descriptor in the default namespace.
</p>
<p>
13. If seamEnabled (# 12), ejb-jar.xml contains necessary interceptor binding
and application.xml contains the jboss-seam.jar java module definition.
</p>
<p>
14. As soon as you introduce session bean attributes, the cartridge assumes
the bean is a stateful session bean. One solution would be to remove this
default so that the only way to specify a session bean as a sfsb
is via tagged value <code>@andromda.service.type</code>.
</p>
<p>
15. Stereotype <![CDATA[<<DataModel>>]]> can be modelled on attributes
(of type java.util.List - but I don't think this can be enforced).
This will render @DataModel on the attribute. An optional tagged value
<code>@andromda.seam.datatable.datamodel.name</code> can be modelled on such
attributes to defined the context variable name if more than 1 datamodel exists.
</p>
<p>
16. Stereotype <![CDATA[<<DataModelSelection>>]]> can be modelled on attributes
to inject the selected value from the DataModel into this attribute. This
will render @DataModelSelection on the attribute. An optional tagged value
<code>@andromda.seam.datatable.datamodel.selection.name</code> can define the
name of the context variable defined by the appropriate @DataModel.
</p>
<p>
17. Stereotype <![CDATA[<<Factory>>]]> can be modelled on session bean
component operations with <code>@andromda.seam.component.factory.context.name</code>
which is modelled on the operation to set the context variable name.
</p>
<p>
18. Stereotype <![CDATA[<<RequestParameter>>]]> can be modelled on session bean
component attribute to indicate an attribute is to be injected with the value
of a request parameter. Optional tagged value
<![CDATA[@andromda.seam.component.requestParameter.name]]> will define the
request parameter name.
</p>
<p>
19. Tagged value <code>@andromda.seam.transaction.rollback.outcome</code> on session
bean component operation, can have multiple values to indicate that transaction
set for rollback on the specified outcomes.
</p>
<p>
20. Not sure if we really need to touch the Java cartridge. If we can add a new
stereotype to define a class/metafacade as a JavaBean in the EJB3 cartridge
and apply the Seam component model to it, it would avoid bloating the 'simple' Java cartridge.
</p>
<p>
21. Tagged value <code>@andromda.seam.component.conversational.ifNotBegunOutcome</code>
if set will render the ifNotBegunOutcome property of the @Conversational annotation
to indicate the JSF outcome for the action if no long-running conversation is
active when the component is invoked.
</p>
<p>
22. Stereotype <![CDATA[<<Begin>>]]> can be modelled on session bean component operations
to indicate a long-running conversation started, which will render a @Begin annotation
on the operation. Should define extra tagged values for ifOutcome, join, nested and
pageflow properties of @Begin annotation.
</p>
<p>
23. Stereotype <![CDATA[<<End>>]]> can be modelled on session bean component operations
to indicate the end of a long running conversation. Define tagged values for ifOutcome
and evenIfException properties.
</p>
<p>
24. Define similar stereotypes/tags for jBPM tasks/processes.
</p>
<p>
25. Stereotype <![CDATA[<<Unwrap>>]]> modelled on attributes but is rendered
on getter method of beans.
</p>
<p>
26. Everything needs to have XDOC documentation.
</p>
</subsection>
<a name="Project_Generator"/>
<subsection name="Project Generator">
<p>
The AndroMDApp project generator from <code>3.2-SNAPSHOT</code> in CVS onwards supports JBoss Seam
for EJB3 and JSF for web project only. As long as you select these components, all the necessary
JBoss Seam properties will be enabled in your project.
</p>
</subsection>
<a name="Seam_Profile"/>
<subsection name="EJB3 Seam Profile">
<p>
There exists a separate Seam profile that needs to be imported into your project. This profile
contains the Seam specific tags and stereotypes you need to model on your components. You can
download the profile project <a href="andromda-profiles-seam-1.0-SNAPSHOT.zip">here</a>.
</p>
</subsection>
</section>
</body>
</document>
1.17 +1 -0 cartridges/andromda-ejb3/src/site/site.xml
Index: site.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/site.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- site.xml 28 Jun 2006 02:58:35 -0000 1.16
+++ site.xml 1 Jul 2006 03:07:39 -0000 1.17
@@ -45,6 +45,7 @@
<item name="Caching and Clustering" href="howto17.html"/>
<item name="Webservices" href="howto18.html"/>
<item name="Embeddable Value Objects" href="howto20.html"/>
+ <item name="JBoss Seam" href="howto21.html"/>
<item name="Tips & Tricks" href="tips.html"/>
</menu>
<menu name="Support">
1.3 +3 -2 cartridges/andromda-ejb3/src/site/fml/faq.fml
Index: faq.fml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/fml/faq.fml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- faq.fml 28 Jun 2006 02:58:35 -0000 1.2
+++ faq.fml 1 Jul 2006 03:07:39 -0000 1.3
@@ -24,8 +24,9 @@
<question>Is JBoss Seam going to be supported?</question>
<answer>
<p>
- That is definitely in the pipeworks. There is some initial support in the cartridge in CVS, but no
- documentation as yet. Stay tuned and keep your eye on the EJB cartridge forum.
+ That is definitely in the pipeworks. There is some initial support in the cartridge in CVS, and
+ some minimal documentation <a href="howto21.html">here</a>.
+ Stay tuned and keep your eye on the EJB cartridge forum.
</p>
</answer>
</faq>
|
|
From: Vance K. <va...@us...> - 2006-06-28 04:54:11
|
User: vancek
Date: 06/06/27 21:54:09
Modified: andromda-ejb3/src/site/xdoc howto16.xml howto9.xml
howto17.xml howto12.xml howto4.xml howto7.xml
howto11.xml howto10.xml howto6.xml howto18.xml
howto3.xml howto8.xml howto20.xml howto13.xml
howto5.xml
andromda-ejb3/src/site/resources HowToModel.xmi
HowToModel-src.zip
Log:
update howtomodel code
Revision Changes Path
1.6 +27 -21 cartridges/andromda-ejb3/src/site/xdoc/howto16.xml
Index: howto16.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto16.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- howto16.xml 26 Jun 2006 06:53:32 -0000 1.5
+++ howto16.xml 28 Jun 2006 04:54:08 -0000 1.6
@@ -51,6 +51,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto16/a/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto16/a/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto16/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto16/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto16/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto16/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto16/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
@@ -72,26 +73,26 @@
</p>
<p>
<ul>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarCreateManageableException.java.txt"><code>CarCreateManageableException.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarDeleteManageableException.java.txt"><code>CarDeleteManageableException.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarReadManageableException.java.txt"><code>CarReadManageableException.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarUpdateManageableException.java.txt"><code>CarUpdateManageableException.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarManageableService.java.txt"><code>CarManageableService.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarManageableServiceBase.java.txt"><code>CarManageableServiceBase.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarForm.java.txt"><code>CarForm.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/ManageCar.java.txt"><code>ManageCar.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/car_help.jsp.txt"><code>car_help.jsp</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/car_crud.jsp.txt"><code>car_crud.jsp</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonCreateManageableException.java.txt"><code>PersonCreateManageableException.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonDeleteManageableException.java.txt"><code>PersonDeleteManageableException.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonReadManageableException.java.txt"><code>PersonReadManageableException.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonUpdateManageableException.java.txt"><code>PersonUpdateManageableException.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonManageableService.java.txt"><code>PersonManageableService.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonManageableServiceBase.java.txt"><code>PersonManageableServiceBase.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonForm.java.txt"><code>PersonForm.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/ManagePerson.java.txt"><code>ManagePerson.java</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/person_help.jsp.txt"><code>person_help.jsp</code></a></p></li>
- <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/person_crud.jsp.txt"><code>person_crud.jsp</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarCreateManageableException.java"><code>CarCreateManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarDeleteManageableException.java"><code>CarDeleteManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarReadManageableException.java"><code>CarReadManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarUpdateManageableException.java"><code>CarUpdateManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarManageableService.java"><code>CarManageableService.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarManageableServiceBase.java"><code>CarManageableServiceBase.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/CarForm.java"><code>CarForm.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/ManageCar.java"><code>ManageCar.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/car_help.jsp"><code>car_help.jsp</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/car_crud.jsp"><code>car_crud.jsp</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonCreateManageableException.java"><code>PersonCreateManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonDeleteManageableException.java"><code>PersonDeleteManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonReadManageableException.java"><code>PersonReadManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonUpdateManageableException.java"><code>PersonUpdateManageableException.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonManageableService.java"><code>PersonManageableService.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonManageableServiceBase.java"><code>PersonManageableServiceBase.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/PersonForm.java"><code>PersonForm.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/ManagePerson.java"><code>ManagePerson.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/person_help.jsp"><code>person_help.jsp</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto16/a/crud/person_crud.jsp"><code>person_crud.jsp</code></a></p></li>
</ul>
</p>
<p>
@@ -102,11 +103,16 @@
<a name="Manageable_Entities_Tips"/>
<subsection name="Tips">
<p>
- You should assign one attribute of every manageable entity as a unique index. This is
+ You should assign one attribute of every manageable entity as a <i>unique</i> attribute. This is
achieved by modelling the <![CDATA[<<Unique>>]]> stereotype on the attribute. As a result, it
will display the unique attribute value for foreign key reference columns when listing entities,
rather than the complete target entity property name-value pairs.
</p>
+ <p>
+ By assigning a unique manageable entity attribute, the <code>readAll</code> method of the
+ manageable service base implementation avoids the use of <code>left join fetch</code> to
+ retrieve collection association objects.
+ </p>
</subsection>
</section>
<section name="Next">
1.5 +2 -0 cartridges/andromda-ejb3/src/site/xdoc/howto9.xml
Index: howto9.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto9.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- howto9.xml 1 Jun 2006 14:38:26 -0000 1.4
+++ howto9.xml 28 Jun 2006 04:54:08 -0000 1.5
@@ -83,6 +83,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto9/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto9/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto9/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto9/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto9/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto9/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
@@ -160,6 +161,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto9/b/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto9/b/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto9/b/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto9/b/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto9/b/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto9/b/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto9/b/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
1.5 +1 -0 cartridges/andromda-ejb3/src/site/xdoc/howto17.xml
Index: howto17.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto17.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- howto17.xml 29 May 2006 01:53:36 -0000 1.4
+++ howto17.xml 28 Jun 2006 04:54:08 -0000 1.5
@@ -78,6 +78,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto17/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto17/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto17/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto17/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto17/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto17/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto17/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
1.5 +1 -0 cartridges/andromda-ejb3/src/site/xdoc/howto12.xml
Index: howto12.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto12.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- howto12.xml 14 Jun 2006 05:12:15 -0000 1.4
+++ howto12.xml 28 Jun 2006 04:54:08 -0000 1.5
@@ -67,6 +67,7 @@
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto7/a/ServiceLocator.java"><code>ServiceLocator.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto7/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto7/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto7/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto7/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto7/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto7/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
1.5 +2 -0 cartridges/andromda-ejb3/src/site/xdoc/howto4.xml
Index: howto4.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto4.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- howto4.xml 29 May 2006 01:53:36 -0000 1.4
+++ howto4.xml 28 Jun 2006 04:54:08 -0000 1.5
@@ -45,6 +45,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto4/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto4/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto4/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto4/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto4/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto4/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto4/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
@@ -99,6 +100,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto4/b/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto4/b/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto4/b/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto4/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto4/b/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto4/b/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto4/b/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
1.5 +1 -0 cartridges/andromda-ejb3/src/site/xdoc/howto7.xml
Index: howto7.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto7.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- howto7.xml 29 May 2006 01:53:36 -0000 1.4
+++ howto7.xml 28 Jun 2006 04:54:08 -0000 1.5
@@ -65,6 +65,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto7/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
<li class="impl"><p><a class="changed" href="src/org/andromda/test/howto7/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto7/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto7/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto7/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto7/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto7/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
1.4 +1 -0 cartridges/andromda-ejb3/src/site/xdoc/howto11.xml
Index: howto11.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto11.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- howto11.xml 29 May 2006 01:53:36 -0000 1.3
+++ howto11.xml 28 Jun 2006 04:54:08 -0000 1.4
@@ -110,6 +110,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto11/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto11/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto11/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto11/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto11/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto11/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto11/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
1.6 +1 -0 cartridges/andromda-ejb3/src/site/xdoc/howto10.xml
Index: howto10.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto10.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- howto10.xml 14 Jun 2006 05:11:30 -0000 1.5
+++ howto10.xml 28 Jun 2006 04:54:08 -0000 1.6
@@ -77,6 +77,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto10/a/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto10/a/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto10/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto10/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto10/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto10/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto10/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
1.3 +1 -0 cartridges/andromda-ejb3/src/site/xdoc/howto6.xml
Index: howto6.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto6.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- howto6.xml 29 May 2006 01:53:36 -0000 1.2
+++ howto6.xml 28 Jun 2006 04:54:08 -0000 1.3
@@ -68,6 +68,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto6/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto6/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto6/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto6/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto6/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto6/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto6/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
1.5 +1 -0 cartridges/andromda-ejb3/src/site/xdoc/howto18.xml
Index: howto18.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto18.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- howto18.xml 29 May 2006 01:53:36 -0000 1.4
+++ howto18.xml 28 Jun 2006 04:54:09 -0000 1.5
@@ -67,6 +67,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto18/a/UserDaoBase.java"><code>UserDaoBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto18/a/UserDaoImpl.java"><code>UserDaoImpl.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto18/a/UserDaoException.java"><code>UserDaoException.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto18/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto18/a/UserEndPointServiceBase.java"><code>UserEndPointServiceBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto18/a/UserEndPointServiceBean.java"><code>UserEndPointServiceBean.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto18/a/UserEndPointServiceRemote.java"><code>UserEndPointServiceRemote.java</code></a></p></li>
1.8 +2 -0 cartridges/andromda-ejb3/src/site/xdoc/howto3.xml
Index: howto3.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto3.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- howto3.xml 14 Jun 2006 05:12:15 -0000 1.7
+++ howto3.xml 28 Jun 2006 04:54:09 -0000 1.8
@@ -57,6 +57,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto3/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
<li class="impl"><p><a class="changed" href="src/org/andromda/test/howto3/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto3/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto3/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto3/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto3/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto3/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
@@ -268,6 +269,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto3/b/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
<li class="impl"><p><a class="changed" href="src/org/andromda/test/howto3/b/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto3/b/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto3/b/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto3/b/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto3/b/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto3/b/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
1.6 +1 -0 cartridges/andromda-ejb3/src/site/xdoc/howto8.xml
Index: howto8.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto8.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- howto8.xml 29 May 2006 01:53:36 -0000 1.5
+++ howto8.xml 28 Jun 2006 04:54:09 -0000 1.6
@@ -175,6 +175,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto8/b/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto8/b/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto8/b/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto8/b/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto8/b/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto8/b/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto8/b/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
1.5 +4 -2 cartridges/andromda-ejb3/src/site/xdoc/howto20.xml
Index: howto20.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto20.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- howto20.xml 28 Jun 2006 02:58:35 -0000 1.4
+++ howto20.xml 28 Jun 2006 04:54:09 -0000 1.5
@@ -12,9 +12,10 @@
embeddable value objects are mapped to column within the entity's table.
</p>
<p>
- The <code>@Embeddable</code> annotation is specified on the class whose instance is
+ The <code>@Embeddable</code> annotation is typically used on the class whose instance is
an embeddable value object of an entity. Only a limited number of annotations are
- permitted on the properties of the embeddable value object.
+ permitted on the properties of the embeddable value object. The EJB3 cartridge defines
+ the embeddable value object using an ORM metadata mapping file.
</p>
<p>
A persistent property of an entity which is an instance of an embeddable value object
@@ -41,6 +42,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto20/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
<li class="gen"><p><a class="changed" href="src/org/andromda/test/howto20/a/PersonName.java"><code>PersonName.java</code></a></p></li>
<li class="impl"><p><a class="changed" href="src/org/andromda/test/howto20/a/PersonNameImpl.java"><code>PersonNameImpl.java</code></a></p></li>
+ <li class="gen"><p><a class="changed" href="src/org/andromda/test/howto20/a/orm.xml"><code>orm.xml</code></a></p></li>
</ul>
</p>
<p>
1.5 +1 -0 cartridges/andromda-ejb3/src/site/xdoc/howto13.xml
Index: howto13.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto13.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- howto13.xml 29 May 2006 01:53:36 -0000 1.4
+++ howto13.xml 28 Jun 2006 04:54:09 -0000 1.5
@@ -45,6 +45,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto13/a/PersonDaoBase.java"><code>PersonDaoBase.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto13/a/PersonDaoImpl.java"><code>PersonDaoImpl.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto13/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto13/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto13/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto13/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto13/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
1.5 +1 -0 cartridges/andromda-ejb3/src/site/xdoc/howto5.xml
Index: howto5.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto5.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- howto5.xml 29 May 2006 01:53:36 -0000 1.4
+++ howto5.xml 28 Jun 2006 04:54:09 -0000 1.5
@@ -54,6 +54,7 @@
<li class="gen"><p><a href="src/org/andromda/test/howto5/a/PersonDaoException.java"><code>PersonDaoException.java</code></a></p></li>
<li class="impl"><p><a href="src/org/andromda/test/howto5/a/RentalServiceBean.java"><code>RentalServiceBean.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto5/a/RentalServiceRemote.java"><code>RentalServiceRemote.java</code></a></p></li>
+ <li class="gen"><p><a href="src/org/andromda/test/howto5/a/ServiceDelegateBase.java"><code>ServiceDelegateBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto5/a/RentalServiceDelegate.java"><code>RentalServiceDelegate.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto5/a/RentalServiceBase.java"><code>RentalServiceBase.java</code></a></p></li>
<li class="gen"><p><a href="src/org/andromda/test/howto5/a/RentalServiceException.java"><code>RentalServiceException.java</code></a></p></li>
1.3 +694 -732 cartridges/andromda-ejb3/src/site/resources/HowToModel.xmi
Index: HowToModel.xmi
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/resources/HowToModel.xmi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- HowToModel.xmi 1 Jun 2006 14:40:04 -0000 1.2
+++ HowToModel.xmi 28 Jun 2006 04:54:09 -0000 1.3
@@ -3,7 +3,7 @@
<!-- This xmi file is optimized for MagicDraw UML. Some references are not saved. -->
<!-- Change MagicDraw UML environment options property General->.Save Rich XMI -->
-<XMI xmi.version='1.2' timestamp='Thu Jun 01 22:19:25 WST 2006' xmlns:UML='omg.org/UML/1.4'>
+<XMI xmi.version='1.2' timestamp='Tue Jun 13 14:21:27 GMT+08:00 2006' xmlns:UML='omg.org/UML/1.4'>
<XMI.header>
<XMI.documentation>
<XMI.exporter>MagicDraw UML</XMI.exporter>
@@ -32,7 +32,7 @@
<UML:Namespace.ownedElement>
<UML:Class xmi.id='_9_5_1_192d044b_1138754931453_489155_31' name='Car'>
<UML:ModelElement.stereotype>
- <UML:Stereotype href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
+ <UML:Stereotype href='andromda-profile-persistence-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::persistence::Entity'/>
</XMI.extension>
@@ -41,7 +41,7 @@
<UML:Classifier.feature>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138754931453_882795_24' name='serial' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -50,7 +50,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138754931453_486062_25' name='name' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -59,7 +59,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138754931453_256328_26' name='type' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -73,7 +73,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_192d044b_1138754931453_74303_27' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::boolean'/>
</XMI.extension>
@@ -89,7 +89,7 @@
<UML:BehavioralFeature.parameter>
<UML:Parameter xmi.id='_9_5_1_192d044b_1138754931453_160387_29' kind='return'>
<UML:Parameter.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_736816_6'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::boolean'/>
</XMI.extension>
@@ -106,7 +106,7 @@
<UML:Namespace.ownedElement>
<UML:Class xmi.id='_9_0_1fe00f9_1106264448296_915735_34' name='Car'>
<UML:ModelElement.stereotype>
- <UML:Stereotype href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
+ <UML:Stereotype href='andromda-profile-persistence-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::persistence::Entity'/>
</XMI.extension>
@@ -119,7 +119,7 @@
<UML:Namespace.ownedElement>
<UML:Class xmi.id='_9_5_1_192d044b_1138755106640_867987_196' name='Car'>
<UML:ModelElement.stereotype>
- <UML:Stereotype href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
+ <UML:Stereotype href='andromda-profile-persistence-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::persistence::Entity'/>
</XMI.extension>
@@ -129,7 +129,7 @@
<UML:TaggedValue xmi.id='_9_5_1_192d044b_1138755292078_826874_257' name='@andromda.persistence.table'>
<UML:TaggedValue.dataValue>MyCar</UML:TaggedValue.dataValue>
<UML:TaggedValue.type>
- <UML:TagDefinition href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_846703_8'>
+ <UML:TagDefinition href='andromda-profile-persistence-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_846703_8'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::persistence::@andromda.persistence.table'/>
</XMI.extension>
@@ -140,7 +140,7 @@
<UML:Classifier.feature>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138755106640_290664_189' name='serial' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -149,7 +149,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138755106640_702216_190' name='name' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -158,7 +158,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138755106640_105668_191' name='type' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -173,7 +173,7 @@
<UML:Namespace.ownedElement>
<UML:Class xmi.id='_9_5_1_192d044b_1138755562125_814288_341' name='Car'>
<UML:ModelElement.stereotype>
- <UML:Stereotype href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
+ <UML:Stereotype href='andromda-profile-persistence-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::persistence::Entity'/>
</XMI.extension>
@@ -182,14 +182,14 @@
<UML:Classifier.feature>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138755562125_291265_338' name='serial' visibility='public'>
<UML:ModelElement.stereotype>
- <UML:Stereotype href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_176418_96'>
+ <UML:Stereotype href='andromda-profile-persistence-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_176418_96'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::persistence::Identifier'/>
</XMI.extension>
</UML:Stereotype>
</UML:ModelElement.stereotype>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -198,7 +198,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138755562125_758113_339' name='name' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -207,7 +207,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138755562125_348119_340' name='type' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -222,7 +222,7 @@
<UML:Namespace.ownedElement>
<UML:Class xmi.id='_9_5_1_192d044b_1138755824062_183318_565' name='Car'>
<UML:ModelElement.stereotype>
- <UML:Stereotype href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
+ <UML:Stereotype href='andromda-profile-persistence-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::persistence::Entity'/>
</XMI.extension>
@@ -231,7 +231,7 @@
<UML:Namespace.ownedElement>
<UML:Class xmi.id='_9_5_1_192d044b_1138759178765_499629_839' name='Car'>
<UML:ModelElement.stereotype>
- <UML:Stereotype href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
+ <UML:Stereotype href='andromda-profile-persistence-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::persistence::Entity'/>
</XMI.extension>
@@ -243,7 +243,7 @@
<UML:Expression xmi.id='_9_5_1_192d044b_1138759270875_652941_918' body='All Wheel Drive'/>
</UML:Attribute.initialValue>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -255,7 +255,7 @@
<UML:Expression xmi.id='_9_5_1_192d044b_1138759270875_59106_919' body='Rear Wheel Drive'/>
</UML:Attribute.initialValue>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -267,7 +267,7 @@
<UML:Expression xmi.id='_9_5_1_192d044b_1138759270875_452052_920' body='Front Wheel Drive'/>
</UML:Attribute.initialValue>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -276,7 +276,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138759178765_840594_836' name='serial' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -285,7 +285,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138759178765_64406_837' name='name' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -294,7 +294,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138759178765_465402_838' name='type' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -307,7 +307,7 @@
<UML:Classifier.feature>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138755824062_494133_562' name='serial' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -323,7 +323,7 @@
</UML:Multiplicity>
</UML:StructuralFeature.multiplicity>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -332,7 +332,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138755824062_819127_564' name='type' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -347,7 +347,7 @@
<UML:Namespace.ownedElement>
<UML:Class xmi.id='_9_5_1_192d044b_1138758867125_536256_680' name='Car'>
<UML:ModelElement.stereotype>
- <UML:Stereotype href='andromda-profile-persistence-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
+ <UML:Stereotype href='andromda-profile-persistence-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119337118921_354011_73'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='org.andromda.profile::persistence::Entity'/>
</XMI.extension>
@@ -359,7 +359,7 @@
<UML:Expression xmi.id='_9_5_1_192d044b_1138759011203_643274_736' body='All Wheel Drive'/>
</UML:Attribute.initialValue>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -371,7 +371,7 @@
<UML:Expression xmi.id='_9_5_1_192d044b_1138759011203_987879_737' body='Rear Wheel Drive'/>
</UML:Attribute.initialValue>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -383,7 +383,7 @@
<UML:Expression xmi.id='_9_5_1_192d044b_1138759011203_604250_738' body='Front Wheel Drive'/>
</UML:Attribute.initialValue>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extenderID='MagicDraw UML 9.5'>
<referentPath xmi.value='datatype::String'/>
</XMI.extension>
@@ -392,7 +392,7 @@
</UML:Attribute>
<UML:Attribute xmi.id='_9_5_1_192d044b_1138758867125_674214_677' name='serial' visibility='public'>
<UML:StructuralFeature.type>
- <UML:Classifier href='andromda-profile-datatype-3.2-RC1-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
+ <UML:Classifier href='andromda-profile-datatype-3.2-SNAPSHOT.xml.zip|_9_0_1fe00f9_1119336925531_364079_66'>
<XMI.extension xmi.extender='MagicDraw UML 9.5' xmi.extender...
[truncated message content] |
|
From: Vance K. <va...@us...> - 2006-06-28 02:58:40
|
User: vancek
Date: 06/06/27 19:58:35
Modified: andromda-ejb3/src/site/xdoc howto.xml howto20.xml
andromda-ejb3/src/site site.xml
andromda-ejb3/src/site/fml faq.fml
Log:
update docs
Revision Changes Path
1.21 +6 -1 cartridges/andromda-ejb3/src/site/xdoc/howto.xml
Index: howto.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- howto.xml 26 Jun 2006 06:53:32 -0000 1.20
+++ howto.xml 28 Jun 2006 02:58:35 -0000 1.21
@@ -242,7 +242,12 @@
</p>
</li>
<li>
- <p><a href="howto20.html">Embeddable Value Objects</a></p>
+ <p>
+ <a href="howto20.html">Embeddable Value Objects</a>
+ <ul>
+ <li><p><a href="howto20.html#Helpful_Hints">Helpful Hints</a></p></li>
+ </ul>
+ </p>
</li>
</ul>
</p>
1.4 +26 -8 cartridges/andromda-ejb3/src/site/xdoc/howto20.xml
Index: howto20.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto20.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- howto20.xml 29 May 2006 01:53:36 -0000 1.3
+++ howto20.xml 28 Jun 2006 02:58:35 -0000 1.4
@@ -44,18 +44,36 @@
</ul>
</p>
<p>
- The cartridge provides basic support for embeddable value objects. Currently, no
- mapping annotations on properties of the embeddable value object are generated. This can easily
- be supported by modification to the <code>EJB3EmbeddedValueFacade</code> and corresponding
- <code>EmbeddedValue.vsl</code> template.
+ You can model basic features on your embeddable class attributes and these will be reflected in the
+ generated embeddable value object. These features are much the same as described in the
+ <a href="howto1.html">howto for entities</a>. The following is a brief list of annotations
+ and some properties that are available on embeddable attributes.
+ <ul>
+ <li><p>@Transient</p></li>
+ <li><p>@Version</p></li>
+ <li><p>@Lob with @Basic settings to fetch type</p></li>
+ <li><p>@Column with properties unique, nullable, insertable, updatable, length, columnDefinition, precision and scale</p></li>
+ <li><p>@Temporal</p></li>
+ <li><p>@Enumerated</p></li>
+ </ul>
</p>
<a name="Helpful_Hints"/>
<subsection name="Helpful Hints">
<p>
- Even though the EJB3 cartridge generates an implementation source file extending the
- auto generated embedded value object, the implementation is currently not used. Future
- version of the EJB3 cartridge will make use of the persistence ORM mapping file and will
- fix this issue.
+ The EJB3 cartridge now uses the persistence ORM mapping file <b>orm.xml</b> to declare the
+ embeddable class metadata. This means that the <code>@Embeddable</code> annotation is no longer
+ rendered in the base or implementation for the embeddable object.
+ The ORM mapping file defines the embeddable implementation, which extends the abstract embeddable
+ base object, as the embeddable class.
+ </p>
+ <p>
+ This has been adopted so that you can have an implementation for embeddable value object operations
+ or any other aspect requiring manual implementation, without having to be concerned with code
+ regeneration over-writing your implementation. This could not be achieved with pure annotations.
+ </p>
+ <p>
+ The cartridge now support having multiple attributes having the same embeddable value object type
+ within a single entity. There is limited support for associations between embeddable value objects.
</p>
</subsection>
</section>
1.16 +4 -2 cartridges/andromda-ejb3/src/site/site.xml
Index: site.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/site.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- site.xml 17 Jun 2006 12:02:21 -0000 1.15
+++ site.xml 28 Jun 2006 02:58:35 -0000 1.16
@@ -12,8 +12,8 @@
<body>
<links>
<item name="EJB3" href="index.html"/>
- <item name="Cartridges" href="../andromda-cartridges/index.html"/>
- <item name="AndroMDA" href="../index.html"/>
+ <item name="Cartridges" href="http://galaxy.andromda.org/docs/andromda-cartridges/index.html"/>
+ <item name="AndroMDA" href="http://www.andromda.org"/>
</links>
<menu name="Overview">
<item name="About EJB3 Cartridge" href="index.html"/>
@@ -49,7 +49,9 @@
</menu>
<menu name="Support">
<item name="FAQ" href="faq.html"/>
+ <item name="Change Report" href="changes-report.html"/>
<item name="EJB Forum" href="http://galaxy.andromda.org/forum/viewforum.php?f=17"/>
+ <item name="JIRA EJB" href="http://galaxy.andromda.org/jira/browse/EJB"/>
</menu>
${reports}
</body>
1.2 +22 -0 cartridges/andromda-ejb3/src/site/fml/faq.fml
Index: faq.fml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/fml/faq.fml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- faq.fml 17 Jun 2006 12:02:21 -0000 1.1
+++ faq.fml 28 Jun 2006 02:58:35 -0000 1.2
@@ -40,5 +40,27 @@
</p>
</answer>
</faq>
+ <faq id="use_of_orm.xml">
+ <question>How does an EJB 3.0 project define meta information?</question>
+ <answer>
+ <p>
+ The cartridge now uses a combination of annotations and orm.xml deployment descriptor to define
+ meta mapping information. The orm.xml will override or even replace certain annotations and allows
+ you to maintain full control by separating generated code and your implementation code.
+ </p>
+ </answer>
+ </faq>
+ <faq id="how_to_stay_up_to_date">
+ <question>How can I stay up to date with the changes to the EJB3 cartridge?</question>
+ <answer>
+ <p>
+ The first thing you should do is register with the AndroMDA forums and select the forums you want to
+ keep your eye on to receive emails of posts.
+ </p>
+ <p>
+ Regularly read the updates in the <a href="changes-report.html">changes report</a>.
+ </p>
+ </answer>
+ </faq>
</part>
</faqs>
|
|
From: Vance K. <va...@us...> - 2006-06-27 11:15:35
|
User: vancek
Date: 06/06/27 04:15:32
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EmbeddedValueFacadeLogicImpl.java
andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip
Log:
added getFullyQualifiedImplementationName to EJB3EmbeddedValueFacade for orm.xml deployment descriptor
Revision Changes Path
1.2 +12 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EmbeddedValueFacadeLogicImpl.java
Index: EJB3EmbeddedValueFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EmbeddedValueFacadeLogicImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- EJB3EmbeddedValueFacadeLogicImpl.java 24 Apr 2006 02:46:11 -0000 1.1
+++ EJB3EmbeddedValueFacadeLogicImpl.java 27 Jun 2006 11:15:31 -0000 1.2
@@ -60,4 +60,16 @@
{
return String.valueOf(this.getConfiguredProperty(EMBEDDED_VALUE_IMPLEMENTATION_NAME_PATTERN));
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EmbeddedValueFacadeLogic#
+ * handleGetFullyQualifiedImplementationName()
+ */
+ protected String handleGetFullyQualifiedImplementationName()
+ {
+ return EJB3MetafacadeUtils.getFullyQualifiedName(
+ this.getPackageName(),
+ this.getImplementationName(),
+ null);
+ }
}
\ No newline at end of file
1.42 +237 -203 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip
<<Binary file>>
|
|
From: Vance K. <va...@us...> - 2006-06-27 11:13:19
|
User: vancek
Date: 06/06/27 04:13:18
Modified: andromda-ejb3/src/main/resources/templates/ejb3
EmbeddedValue.vsl
andromda-ejb3/src/changes changes.xml
andromda-ejb3/src/main/resources/META-INF/andromda
cartridge.xml
Added: andromda-ejb3/src/main/resources/templates/ejb3/config
orm.xml.vsl
Log:
fix JIRA EJB-29 - use orm.xml to define the embedded value object implementation class as the embeddable class
introduced orm.xml to over-write metadata annotations using deployment descriptor
Revision Changes Path
1.3 +36 -36 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EmbeddedValue.vsl
Index: EmbeddedValue.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EmbeddedValue.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EmbeddedValue.vsl 26 Jun 2006 15:07:37 -0000 1.2
+++ EmbeddedValue.vsl 27 Jun 2006 11:13:17 -0000 1.3
@@ -10,8 +10,10 @@
/**
$embeddedValue.getDocumentation(" * ")
+ *
+ * Migrated from using @javax.persistence.Embeddable annotation to mapping in orm.xml
+ * Still use the attribute annotations
*/
-...@ja...rsistence.Embeddable
public abstract class $embeddedValue.name
#if($embeddedValue.generalization)
extends $embeddedValue.generalization.fullyQualifiedName
@@ -28,19 +30,17 @@
* Creates a new instance of {@link ${embeddedValue.name}}
* taking all properties.
*/
-#set ($parenthesis = "(")
-#if ($embeddedValue.attributes.empty)
-#set ($parenthesis = "()")
-#end
- public static $embeddedValue.name newInstance${parenthesis}#foreach ($attribute in $embeddedValue.attributes)
-$attribute.getterSetterTypeName ${attribute.name}#if($velocityCount != $embeddedValue.attributes.size()),#else)
-#end
-#end
+#**##set ($parenthesis = "(")
+#**##if ($embeddedValue.attributes.empty)
+#* *##set ($parenthesis = "()")
+#**##end
+ public static $embeddedValue.name newInstance${parenthesis}#foreach ($attribute in $embeddedValue.attributes)$attribute.getterSetterTypeName ${attribute.name}#if($velocityCount != $embeddedValue.attributes.size()),#else)#end#end
+
{
$embeddedValue.implementationName object = new ${embeddedValue.implementationName}();
-#foreach ($attribute in $embeddedValue.attributes)
+#**##foreach ($attribute in $embeddedValue.attributes)
object.${attribute.setterName}($attribute.name);
-#end
+#**##end
object.initialize();
return object;
}
@@ -69,7 +69,7 @@
{
}
-#foreach ($attribute in $embeddedValue.attributes)
+#**##foreach ($attribute in $embeddedValue.attributes)
private $attribute.getterSetterTypeName $attribute.name;
/**
@@ -117,31 +117,31 @@
return this.${attribute.name};
}
-#if ($embeddedValue.immutable)
+#* *##if ($embeddedValue.immutable)
// protected setter, if subclass methods need to normalize the $embeddedValue.name
protected void ${attribute.setterName}(#if ($stringUtils.isNotBlank($attribute.lobType))${attribute.lobType}#else${attribute.getterSetterTypeName}#end $attribute.name)
-#else
+#* *##else
$attribute.visibility void ${attribute.setterName}(#if ($stringUtils.isNotBlank($attribute.lobType))${attribute.lobType}#else${attribute.getterSetterTypeName}#end $attribute.name)
-#end
+#* *##end
{
this.${attribute.name} = $attribute.name;
}
-#end
-#foreach ($operation in $embeddedValue.operations)
-#set ($returnType = $operation.returnType)
-#set ($signature = $operation.signature)
+#**##end
+#**##foreach ($operation in $embeddedValue.operations)
+#* *##set ($returnType = $operation.returnType)
+#* *##set ($signature = $operation.signature)
/**
$operation.getDocumentation(" * ")
*/
-#if ($operation.exceptionsPresent)
+#* *##if ($operation.exceptionsPresent)
$operation.visibility abstract $returnType.fullyQualifiedName $signature
throws $operation.exceptionList;
-#else
+#* *##else
$operation.visibility abstract $returnType.fullyQualifiedName $signature;
-#end
+#* *##end
-#end
+#**##end
#end
/**
* Indicates if the argument is of the same type and all values are equal.
1.1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/orm.xml.vsl
Index: orm.xml.vsl
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
version="1.0">
#foreach ($embeddable in $embeddables)
<embeddable class="$embeddable.fullyQualifiedImplementationName"/>
#end
</entity-mappings>
1.15 +9 -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.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- changes.xml 27 Jun 2006 05:20:29 -0000 1.14
+++ changes.xml 27 Jun 2006 11:13:18 -0000 1.15
@@ -186,11 +186,20 @@
</action>
<action dev="vancek" due-to="tlu" type="add">
Add support for embedded value object associations as well as attribute overrides. JIRA EJB-32.
+ NOTE: This is still partial support. The association mutators need to be added with appropriate
+ annotation to the embedded value object base abstract class.
</action>
<action dev="vancek" due-to="tlu" type="fix">
Fix problem when there are two embedded value objects of the same type in the same entity. Fix for both
attribute and association overrides. JIRA EJB=33
</action>
+ <action dev="vancek" due-to="tlu" type="update">
+ JIRA EJB-29 - the implementation class of the embedded value object was unused and the base class was abstract.
+ This is now fixed with the introduction of the orm.xml deployment descriptor. Currently, only
+ the embeddable classes are defined. As a result the @Embeddable annotation is removed from the base abstract
+ class and the embeddable implementation class is now the defined as the embeddable class using orm.xml rather
+ than metadata annotation.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.27 +15 -1 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.26
retrieving revision 1.27
diff -u -w -r1.26 -r1.27
--- cartridge.xml 14 Jun 2006 08:08:47 -0000 1.26
+++ cartridge.xml 27 Jun 2006 11:13:18 -0000 1.27
@@ -357,6 +357,20 @@
<!-- Configuration Templates -->
<template
+ path="templates/ejb3/config/orm.xml.vsl"
+ outputPattern="META-INF/orm.xml"
+ outlet="session-config"
+ overwrite="true"
+ outputToSingleFile="true"
+ outputOnEmptyElements="false">
+ <modelElements>
+ <modelElement variable="embeddables">
+ <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EmbeddedValueFacade"/>
+ </modelElement>
+ </modelElements>
+ </template>
+
+ <template
path="templates/ejb3/config/ejb-jar.xml.vsl"
outputPattern="META-INF/ejb-jar.xml"
outlet="session-config"
|
|
From: Vance K. <va...@us...> - 2006-06-27 05:20:31
|
User: vancek
Date: 06/06/26 22:20:29
Modified: andromda-ejb3/src/changes changes.xml
andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
Log:
fixes for embedded value object associations and multiple embedded objects of the same type in a single entity JIRA EJB-32 and EJB-33
Revision Changes Path
1.14 +7 -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.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- changes.xml 27 Jun 2006 02:20:14 -0000 1.13
+++ changes.xml 27 Jun 2006 05:20:29 -0000 1.14
@@ -184,6 +184,13 @@
confirm if @Transient, @Version, @Lob and @Basic are supported. @Column, @Temporal and @Enumerated have
been confirmed to work. JIRA EJB-31
</action>
+ <action dev="vancek" due-to="tlu" type="add">
+ Add support for embedded value object associations as well as attribute overrides. JIRA EJB-32.
+ </action>
+ <action dev="vancek" due-to="tlu" type="fix">
+ Fix problem when there are two embedded value objects of the same type in the same entity. Fix for both
+ attribute and association overrides. JIRA EJB=33
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.36 +33 -2 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
Index: EntityEmbeddable.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -w -r1.35 -r1.36
--- EntityEmbeddable.vsl 27 Jun 2006 02:20:14 -0000 1.35
+++ EntityEmbeddable.vsl 27 Jun 2006 05:20:29 -0000 1.36
@@ -418,13 +418,44 @@
#* *##end
#* *##if ($attribute.containsEmbeddedObject)
@javax.persistence.Embedded
+##
+## Render AttributeOverrides if attributes exist on the embedded object
+##
+#* *##if (!$attribute.type.attributes.empty)
@javax.persistence.AttributeOverrides
({
#* *##foreach ($embeddedAttribute in $attribute.type.attributes)
- @javax.persistence.AttributeOverride(name = "${embeddedAttribute.name}", column = @javax.persistence.Column(name = "${embeddedAttribute.columnName}"#if ($embeddedAttribute.unique), unique = ${embeddedAttribute.unique}#end#if (!$embeddedAttribute.columnNullable), nullable = ${embeddedAttribute.columnNullable}#end#**#, insertable = ${embeddedAttribute.insertEnabled}, updatable = ${embeddedAttribute.updateEnabled}#if ($embeddedAttribute.columnLength), length = ${embeddedAttribute.columnLength}#end#if ($embeddedAttribute.columnDefinition), columnDefinition = "${embeddedAttribute.columnDefinition}"#end#if ($embeddedAttribute.columnPrecision), precision = ${embeddedAttribute.columnPrecision}#end#if ($embeddedAttribute.columnScale), scale = ${embeddedAttribute.columnScale}#end))#if($velocityCount != $attribute.type.attributes.size()),#end
+ @javax.persistence.AttributeOverride(name = "${embeddedAttribute.name}", column = @javax.persistence.Column(name = "${attribute.columnName}_${embeddedAttribute.columnName}"#if ($embeddedAttribute.unique), unique = ${embeddedAttribute.unique}#end#if (!$embeddedAttribute.columnNullable), nullable = ${embeddedAttribute.columnNullable}#end#**#, insertable = ${embeddedAttribute.insertEnabled}, updatable = ${embeddedAttribute.updateEnabled}#if ($embeddedAttribute.columnLength), length = ${embeddedAttribute.columnLength}#end#if ($embeddedAttribute.columnDefinition), columnDefinition = "${embeddedAttribute.columnDefinition}"#end#if ($embeddedAttribute.columnPrecision), precision = ${embeddedAttribute.columnPrecision}#end#if ($embeddedAttribute.columnScale), scale = ${embeddedAttribute.columnScale}#end))#if($velocityCount != $attribute.type.attributes.size()),#end
+
+#* *##end
+ })
+#* *##end
+##
+## Render AssociationOverrides for embedded object if associations exist on the embedded object
+##
+#* *##if (!$attribute.type.associationEnds.empty)
+ @javax.persistence.AssociationOverrides
+ ({
+#* *##foreach ($associationEnd in $attribute.type.associationEnds)
+#* *##set ($target = $associationEnd.otherEnd)
+#* *##if (!$target.type.compositePrimaryKeyPresent)
+ @javax.persistence.AssociationOverride(name = "${target.name}", joinColumns = @javax.persistence.JoinColumn(name = "${attribute.columnName}_$stringUtils.upperCase(${target.name})"#if ($associationEnd.columnDefinition), columnDefinition = "${associationEnd.columnDefinition}"#end))#if($velocityCount != $attribute.type.associationEnds.size()),#end
+
+#* *##else
+#* *##set ($identifiers = $target.type.getIdentifiers())
+ @javax.persistence.AssociationOverride(name = "${target.name}",
+ joinColumns =
+ {
+#* *##foreach ($attribute in $identifiers)
+ @javax.persistence.JoinColumn(name = "${attribute.columnName}_$stringUtils.upperCase(${target.name})_${attribute.columnName}", referencedColumnName = "${attribute.columnName}")#if($velocityCount != $identifiers.size()),#end
+
+#* *##end
+ })#if($velocityCount != $attribute.type.associationEnds.size()),#end
#* *##end
+#* *##end
})
+#* *##end
#* *##else
@javax.persistence.Column(name = "${attribute.columnName}"#if ($attribute.unique), unique = ${attribute.unique}#end#if (!$attribute.columnNullable), nullable = ${attribute.columnNullable}#end#**#, insertable = ${attribute.insertEnabled}, updatable = ${attribute.updateEnabled}#if ($attribute.columnLength), length = ${attribute.columnLength}#end#if ($attribute.columnDefinition), columnDefinition = "${attribute.columnDefinition}"#end#if ($attribute.columnPrecision), precision = ${attribute.columnPrecision}#end#if ($attribute.columnScale), scale = ${attribute.columnScale}#end)
#* *##end
|
|
From: Vance K. <va...@us...> - 2006-06-27 02:20:16
|
User: vancek
Date: 06/06/26 19:20:14
Modified: andromda-ejb3/src/changes changes.xml
andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
Log:
instantiate collection association end declaration with appropriate collection implementation
Revision Changes Path
1.13 +2 -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.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- changes.xml 26 Jun 2006 15:12:23 -0000 1.12
+++ changes.xml 27 Jun 2006 02:20:14 -0000 1.13
@@ -159,6 +159,8 @@
for association end collection index name and type (further map support) to be specified via tagged values
@andromda.persistence.collection.index and @andromda.persistence.collection.index.type. This introduced
a new facade called EJB3TypeFacade.
+ Every collection type association end now instantiates the corresponding implementation upon
+ declaration.
</action>
<action dev="vancek" type="fix">
Fixed isRequired in EJB3AssociationEndFacade and EJB3EntityAttributeFacade to exclude property if
1.35 +5 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
Index: EntityEmbeddable.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -w -r1.34 -r1.35
--- EntityEmbeddable.vsl 26 Jun 2006 14:21:51 -0000 1.34
+++ EntityEmbeddable.vsl 27 Jun 2006 02:20:14 -0000 1.35
@@ -191,7 +191,11 @@
#**##foreach ($associationEnd in $entityRelations)
#* *##set ($target = $associationEnd.otherEnd)
#* *##if ($target.navigable)
- private $target.getterSetterTypeName ${target.name};
+#* *##if ($target.many)
+ private $target.getterSetterTypeName $target.name = $target.collectionTypeImplementation;
+#* *##else
+ private $target.getterSetterTypeName $target.name;
+#* *##end
#* *##end
#**##end
#end
|
|
From: Vance K. <va...@us...> - 2006-06-26 16:10:44
|
User: vancek
Date: 06/06/26 08:07:37
Modified: andromda-ejb3/src/main/resources/templates/ejb3
EmbeddedValue.vsl
Log:
add support for metatype annotation on attribute getters of embedded value objects - JIRA EJB-31
Revision Changes Path
1.2 +50 -6 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EmbeddedValue.vsl
Index: EmbeddedValue.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EmbeddedValue.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- EmbeddedValue.vsl 24 Apr 2006 02:22:31 -0000 1.1
+++ EmbeddedValue.vsl 26 Jun 2006 15:07:37 -0000 1.2
@@ -75,16 +75,53 @@
/**
$attribute.getDocumentation(" * ")
*/
- $attribute.visibility $attribute.getterSetterTypeName ${attribute.getterName}()
+##
+## If attribute is transient ONLY add Transient annotation
+##
+#* *##if ($attribute.transient)
+ @javax.persistence.Transient
+#* *##else
+#* *##if ($attribute.version)
+ @javax.persistence.Version
+#* *##end
+#* *##if ($attribute.lob)
+##
+## Add if LOB type is specified - do not set LOB type as of PFD Spec - inferred from type.
+## Also sepcify Fetch type in Basic annotation if set to EAGER since
+## default fetch type for LOB annotation is LAZY.
+##
+ @javax.persistence.Lob
+#* *##if ($attribute.eager)
+ @javax.persistence.Basic(fetch = javax.persistence.FetchType.EAGER)
+#* *##end
+#* *##end
+ @javax.persistence.Column(name = "${attribute.columnName}"#if ($attribute.unique), unique = ${attribute.unique}#end#if (!$attribute.columnNullable), nullable = ${attribute.columnNullable}#end#**#, insertable = ${attribute.insertEnabled}, updatable = ${attribute.updateEnabled}#if ($attribute.columnLength), length = ${attribute.columnLength}#end#if ($attribute.columnDefinition), columnDefinition = "${attribute.columnDefinition}"#end#if ($attribute.columnPrecision), precision = ${attribute.columnPrecision}#end#if ($attribute.columnScale), scale = ${attribute.columnScale}#end)
+#* *##if (!$attribute.lob && $attribute.lazy)
+##
+## Only add the fetch type property for LAZY hints - default is EAGER
+##
+ @javax.persistence.Basic(fetch = javax.persistence.FetchType.LAZY)
+#* *##end
+#* *##if ($stringUtils.isNotBlank($attribute.temporalType))
+ @javax.persistence.Temporal(javax.persistence.TemporalType.${attribute.temporalType})
+#* *##end
+#* *##if ($stringUtils.isNotBlank($attribute.enumerationType))
+ @javax.persistence.Enumerated(javax.persistence.EnumType.${attribute.enumerationType})
+#* *##end
+#* *##end
+##
+## Override attribute type if attribute is a LOB and lob type is specified
+##
+ $attribute.visibility #if ($stringUtils.isNotBlank($attribute.lobType))${attribute.lobType}#else${attribute.getterSetterTypeName}#end ${attribute.getterName}()
{
return this.${attribute.name};
}
#if ($embeddedValue.immutable)
// protected setter, if subclass methods need to normalize the $embeddedValue.name
- protected void ${attribute.setterName}($attribute.getterSetterTypeName $attribute.name)
+ protected void ${attribute.setterName}(#if ($stringUtils.isNotBlank($attribute.lobType))${attribute.lobType}#else${attribute.getterSetterTypeName}#end $attribute.name)
#else
- $attribute.visibility void ${attribute.setterName}($attribute.getterSetterTypeName $attribute.name)
+ $attribute.visibility void ${attribute.setterName}(#if ($stringUtils.isNotBlank($attribute.lobType))${attribute.lobType}#else${attribute.getterSetterTypeName}#end $attribute.name)
#end
{
this.${attribute.name} = $attribute.name;
@@ -109,8 +146,15 @@
/**
* Indicates if the argument is of the same type and all values are equal.
*/
-#renderEqualsMethod($class $embeddedValue.name $embeddedValue.attributes)
-
#set ($attributeCollection = $embeddedValue.attributes)
-#renderHashCodeMethod($class $attributeCollection)
+#renderEqualsMethod($embeddedValue $embeddedValue.name $attributeCollection)
+
+#renderHashCodeMethod($embeddedValue $attributeCollection)
+
+ /**
+ * Returns a String representation of the object
+ *
+ * @return String Textual representation of the object displaying name/value pairs for all attributes
+ */
+#renderToStringMethod($embeddedValue $embeddedValue.name $attributeCollection)
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-06-26 16:09:36
|
User: vancek
Date: 06/06/26 08:12:23
Modified: andromda-ejb3/src/changes changes.xml
Log:
update
Revision Changes Path
1.12 +6 -1 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.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- changes.xml 26 Jun 2006 14:40:34 -0000 1.11
+++ changes.xml 26 Jun 2006 15:12:23 -0000 1.12
@@ -171,12 +171,17 @@
</action>
<action dev="vancek" due-to="tlu" type="fix">
Fix erroneous signature of entity constructor where no entity attributes exist but navigable associations
- do exist.
+ do exist. JIRA EJB-34
</action>
<action dev="vancek" type="update">
Revert the build back to using the default Java compiler (1.4) - 1.5 isn't supported for the automated
build process for andromda-plugins.
</action>
+ <action dev="vancek" due-to="tlu" type="add">
+ Add support for a select few meta type annotations for attribues in embedded value classes. Need to
+ confirm if @Transient, @Version, @Lob and @Basic are supported. @Column, @Temporal and @Enumerated have
+ been confirmed to work. JIRA EJB-31
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
