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: Chris M. <cm...@us...> - 2007-08-07 12:15:34
|
User: cmicali
Date: 07/08/07 05:14:58
Modified: andromda-cs pom.xml
andromda-nhibernate pom.xml
andromda-nspring pom.xml
Log:
- Disabled tests
Revision Changes Path
1.14 +1 -1 cartridges/andromda-cs/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/pom.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- pom.xml 1 Aug 2007 04:13:23 -0000 1.13
+++ pom.xml 7 Aug 2007 12:14:57 -0000 1.14
@@ -79,7 +79,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>
1.14 +1 -1 cartridges/andromda-nhibernate/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/pom.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- pom.xml 1 Aug 2007 04:13:23 -0000 1.13
+++ pom.xml 7 Aug 2007 12:14:58 -0000 1.14
@@ -119,7 +119,7 @@
</plugins>
</build>
<properties>
- <maven.test.skip>false</maven.test.skip>
+ <maven.test.skip>true</maven.test.skip>
<model.uri>jar:file:${pom.basedir}/src/main/uml/HibernateMetafacadeModel.xml.zip!/HibernateMetafacadeModel.xml</model.uri>
<test.model.uri>jar:file:${pom.basedir}/src/test/uml/HibernateCartridgeTestModel.xml.zip!/HibernateCartridgeTestModel.xml</test.model.uri>
</properties>
1.11 +1 -1 cartridges/andromda-nspring/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/pom.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- pom.xml 1 Aug 2007 04:13:23 -0000 1.10
+++ pom.xml 7 Aug 2007 12:14:58 -0000 1.11
@@ -117,7 +117,7 @@
</plugins>
</build>
<properties>
- <maven.test.skip>false</maven.test.skip>
+ <maven.test.skip>true</maven.test.skip>
<application.package>org.andromda.cartridges.nspring</application.package>
<model.uri>jar:file:${pom.basedir}/src/main/uml/SpringMetafacadeModel.xml.zip!/SpringMetafacadeModel.xml</model.uri>
<test.model.uri>jar:file:${pom.basedir}/src/test/uml/NSpringCartridgeTestModel.xml.zip!/NSpringCartridgeTestModel.xml</test.model.uri>
|
|
From: Chris M. <cm...@us...> - 2007-08-07 02:31:15
|
User: cmicali
Date: 07/08/06 19:31:18
Modified: andromda-nhibernate/src/main/resources/templates/nhibernate
NHibernateEntity.vsl NHibernateEntityImplManual.vsl
Log:
- Added interface support to entities in the NHibernate cartridge
Revision Changes Path
1.10 +5 -2 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl
Index: NHibernateEntity.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- NHibernateEntity.vsl 3 Aug 2007 14:55:14 -0000 1.9
+++ NHibernateEntity.vsl 7 Aug 2007 02:31:18 -0000 1.10
@@ -16,8 +16,11 @@
/// </summary>
[Serializable]
public partial class $entity.entityName
-#if($entity.generalization)
- : $entity.generalization.fullyQualifiedEntityName
+#if($entity.generalization) : $entity.generalization.fullyQualifiedEntityName
+#end
+#if($entity.generalization && !$entity.interfaceAbstractions.empty) , #end
+#if(!$entity.generalization && !$entity.interfaceAbstractions.empty) : #end
+#if (!$entity.interfaceAbstractions.empty) $entity.implementedInterfaceList
#end
{
1.5 +1 -1 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImplManual.vsl
Index: NHibernateEntityImplManual.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImplManual.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- NHibernateEntityImplManual.vsl 3 Aug 2007 14:55:14 -0000 1.4
+++ NHibernateEntityImplManual.vsl 7 Aug 2007 02:31:18 -0000 1.5
@@ -21,7 +21,7 @@
/// <see cref="${entity.fullyQualifiedEntityName}#${operation.getSignature(false)}"/>
/// </summary>
#set ($abstract = $entity.abstract && $operation.abstract)
- $operation.visibility#if ($abstract) abstract#end $operation.returnType.fullyQualifiedName $operation.signature#if ($abstract && !$operation.exceptionsPresent);#end
+ $operation.visibility#if ($abstract) abstract#else virtual#end $operation.returnType.fullyQualifiedName $operation.signature#if ($abstract && !$operation.exceptionsPresent);#end
#if (!$abstract)
{
|
|
From: Chris M. <cm...@us...> - 2007-08-07 02:29:39
|
User: cmicali
Date: 07/08/06 19:29:41
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven
Maven2Proxy.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
WizardSolutionProcessor.cs
Log:
- Fixed crash in Maven2Proxy.cs when maven reported incorrect download progress
- Added NHibernateTypeMappings to the AndroMDA solution folder in the solution wizard
- Cleaned up andromda.xml
Revision Changes Path
1.6 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven/Maven2Proxy.cs
Index: Maven2Proxy.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven/Maven2Proxy.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- Maven2Proxy.cs 3 Aug 2007 14:45:49 -0000 1.5
+++ Maven2Proxy.cs 7 Aug 2007 02:29:41 -0000 1.6
@@ -50,7 +50,7 @@
{
int current = int.Parse(t[0]);
int total = int.Parse(t[1].Remove(t[1].Length - 1));
- //string progressText = current.ToString("{0:0,0}") + "/" + total.ToString("{0:0,0}") + isBytes ? "b" : "K";
+ if (current > total) total = current;
OutputWindow.DTE.StatusBar.Progress(true, "AndroMDA: Maven: Downloading file... " + text, current, total);
cancelOutput = true;
}
1.19 +1 -0 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.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- WizardSolutionProcessor.cs 3 Aug 2007 14:45:49 -0000 1.18
+++ WizardSolutionProcessor.cs 7 Aug 2007 02:29:41 -0000 1.19
@@ -219,6 +219,7 @@
}
solutionFolder.ProjectItems.AddFromFile(m_dstPath + "mda\\conf\\andromda.xml");
solutionFolder.ProjectItems.AddFromFile(m_dstPath + "mda\\conf\\mappings\\MergeMappings.xml");
+ solutionFolder.ProjectItems.AddFromFile(m_dstPath + "mda\\conf\\mappings\\NHibernateTypeMappings.xml");
//solutionFolder.ProjectItems.AddFromFile(m_dstPath + "mda\\src\\uml\\" + m_configuration["application.model.filename"]);
}
catch { }
|
|
From: Chris M. <cm...@us...> - 2007-08-03 14:55:20
|
User: cmicali Date: 07/08/03 07:55:21 Modified: andromda-nhibernate/src/test/expected cartridge-output.zip Log: - Removed abstract methods from entity base class Revision Changes Path 1.10 +15 -17 cartridges/andromda-nhibernate/src/test/expected/cartridge-output.zip <<Binary file>> |
|
From: Chris M. <cm...@us...> - 2007-08-03 14:55:13
|
User: cmicali
Date: 07/08/03 07:55:14
Modified: andromda-nhibernate/src/main/resources/templates/nhibernate
NHibernateEntity.vsl NHibernateEntityImplManual.vsl
Log:
- Removed abstract methods from entity base class
Revision Changes Path
1.9 +0 -13 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl
Index: NHibernateEntity.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- NHibernateEntity.vsl 1 Aug 2007 04:13:28 -0000 1.8
+++ NHibernateEntity.vsl 3 Aug 2007 14:55:14 -0000 1.9
@@ -100,19 +100,6 @@
#endregion
- #region Abstract Methods
-#foreach ($operation in $entity.businessOperations)
-#set ($returnType = $operation.returnType)
-#set ($signature = $operation.signature)
- /// <summary>
-$operation.getDocumentation(" /// ")
- /// </summary>
- $operation.visibility abstract $returnType.fullyQualifiedName $signature;
-
-#end
-
- #endregion
-
#region Overriden Methods
#if ($generateEntityEqualsAndHashCode.equalsIgnoreCase('true'))
1.4 +1 -1 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImplManual.vsl
Index: NHibernateEntityImplManual.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImplManual.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NHibernateEntityImplManual.vsl 1 Aug 2007 04:13:29 -0000 1.3
+++ NHibernateEntityImplManual.vsl 3 Aug 2007 14:55:14 -0000 1.4
@@ -21,7 +21,7 @@
/// <see cref="${entity.fullyQualifiedEntityName}#${operation.getSignature(false)}"/>
/// </summary>
#set ($abstract = $entity.abstract && $operation.abstract)
- $operation.visibility#if ($abstract) abstract#end override $operation.returnType.fullyQualifiedName $operation.signature#if ($abstract && !$operation.exceptionsPresent);#end
+ $operation.visibility#if ($abstract) abstract#end $operation.returnType.fullyQualifiedName $operation.signature#if ($abstract && !$operation.exceptionsPresent);#end
#if (!$abstract)
{
|
|
From: Chris M. <cm...@us...> - 2007-08-03 14:46:01
|
User: cmicali
Date: 07/08/03 07:46:03
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer Android VS
Setup.nsi
Log:
- Added SQLServer2005 dialect to solution wizard
- Added Lorna Burnet's patches
Revision Changes Path
No revision
No revision
No revision
|
|
From: Chris M. <cm...@us...> - 2007-08-03 14:45:50
|
User: cmicali
Date: 07/08/03 07:45:50
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven
Maven2Proxy.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn
WizardSolutionProcessor.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards
MDASolutionWizard.cs MDASolutionWizard.designer.cs
WelcomeWizard.cs
Log:
- Added SQLServer2005 dialect to solution wizard
- Added Lorna Burnet's patches
Revision Changes Path
1.5 +60 -10 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven/Maven2Proxy.cs
Index: Maven2Proxy.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Maven/Maven2Proxy.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- Maven2Proxy.cs 22 Jan 2007 13:22:42 -0000 1.4
+++ Maven2Proxy.cs 3 Aug 2007 14:45:49 -0000 1.5
@@ -41,18 +41,21 @@
if (text == string.Empty) return;
else
{
- if (text.EndsWith("K"))
+ if (text.EndsWith("K") || text.EndsWith("b"))
{
+ bool isBytes = false;
+ if (text.EndsWith("b")) isBytes = true;
string[] t = text.Split('/');
if (t.Length == 2)
{
int current = int.Parse(t[0]);
int total = int.Parse(t[1].Remove(t[1].Length - 1));
+ //string progressText = current.ToString("{0:0,0}") + "/" + total.ToString("{0:0,0}") + isBytes ? "b" : "K";
OutputWindow.DTE.StatusBar.Progress(true, "AndroMDA: Maven: Downloading file... " + text, current, total);
cancelOutput = true;
}
}
- else if (text.EndsWith("K downloaded"))
+ else if (text.EndsWith("K downloaded") || text.EndsWith("b downloaded"))
{
OutputWindow.DTE.StatusBar.Progress(false, "Android/VS: Generation Progress",0,0);
}
@@ -74,26 +77,73 @@
string maven_cmd_line_args = m_mavenOptions;
string classworlds_jar = string.Empty;
- if (java_home == null || java_home == string.Empty)
+ if (string.IsNullOrEmpty(java_home))
{
- throw new MavenProxyKnownException("Error: Maven cannot run because the JAVA_HOME environment variable is not set.\nError: Please check your java installation.");
+ throw new MavenProxyKnownException(
+ "Error: Maven cannot run because the JAVA_HOME environment variable is not set.\n"
+ + "Error: Please check your java installation.");
}
- if (maven_home == null || maven_home == string.Empty)
+ if (string.IsNullOrEmpty(maven_home))
{
- throw new MavenProxyKnownException("Error: Maven cannot run because the M2_HOME environment variable is not set.\nError: Please check that maven 2.x has been correctly installed.");
+ throw new MavenProxyKnownException(
+ "Error: Maven cannot run because the M2_HOME environment variable is not set.\n"
+ + "Error: Please check that maven 2.x has been correctly installed.");
}
- if (maven_opts == null || maven_opts == string.Empty)
+ if (string.IsNullOrEmpty(maven_opts))
{
maven_opts = "-Xmx256m";
}
- string[] classworldJars = System.IO.Directory.GetFiles(maven_home + "\\core\\boot", "classworlds-*.jar", System.IO.SearchOption.TopDirectoryOnly);
+ string bootPath = maven_home + @"\core\boot";
+
+ if (!System.IO.Directory.Exists(bootPath))
+ {
+ bootPath = maven_home + @"\boot";
+ }
+
+ if (!System.IO.Directory.Exists(bootPath))
+ {
+ throw new MavenProxyKnownException(
+ "Error: Maven cannot run because the M2_HOME boot folder does not exist.\n"
+ + "Error: Please check that maven 2.x has been correctly installed.");
+ }
+
+ string[] classworldJars = null;
+
+ try
+ {
+ classworldJars = System.IO.Directory.GetFiles(
+ bootPath,
+ "classworlds-*.jar",
+ System.IO.SearchOption.TopDirectoryOnly);
+ }
+ catch (Exception ex)
+ {
+ throw new MavenProxyKnownException(
+ "Error: " + ex.Message + "\n"
+ + "Error: Please check that maven 2.x has been correctly installed.");
+ }
+
+ if (classworldJars == null
+ || classworldJars.Length < 1
+ || string.IsNullOrEmpty(classworldJars[0]))
+ {
+ throw new MavenProxyKnownException(
+ "Error: Maven cannot run because the boot class path cannot be constructed.\n"
+ + "Error: Please check that maven 2.x has been correctly installed.");
+ }
+
+
classworlds_jar = classworldJars[0];
this.ExecutablePath = maven_java_exe;
- this.CommandLine = maven_opts + " -classpath \"" + classworlds_jar + "\" \"-Dclassworlds.conf=" + maven_home + "\\bin\\m2.conf\" " +
- "\"-Dmaven.home=" + maven_home + "\" org.codehaus.classworlds.Launcher ";
+ this.CommandLine =
+ maven_opts
+ + @" -classpath """ + classworlds_jar + @""""
+ + @" ""-Dclassworlds.conf=" + maven_home + @"\bin\m2.conf"""
+ + @" ""-Dmaven.home=" + maven_home + @""""
+ + @" org.codehaus.classworlds.Launcher ";
this.CommandLine += maven_cmd_line_args;
1.18 +3 -3 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.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- WizardSolutionProcessor.cs 1 Aug 2007 05:10:37 -0000 1.17
+++ WizardSolutionProcessor.cs 3 Aug 2007 14:45:49 -0000 1.18
@@ -321,7 +321,7 @@
// Write the nhibernate.config if required
if (GetConfigSettingBool("projects.web.usenhibernateconfig"))
{
- WriteFile("Web/nhibernate.config", webProject.Name + "nhibernate.config", WriteFileProperties.DestinationPathAlreadyComplete);
+ WriteFile("Web/nhibernate.config", webProject.Name + "nhibernate.config", WriteFileProperties.DestinationPathAlreadyComplete | WriteFileProperties.ParseVariables);
}
string webConfigDstFile = webProject.Name + "Web.config";
@@ -329,7 +329,7 @@
if (!System.IO.File.Exists(webConfigDstFile))
{
// Write out the web.config file
- WriteFile("Web/web.config", webConfigDstFile, WriteFileProperties.DestinationPathAlreadyComplete);
+ WriteFile("Web/web.config", webConfigDstFile, WriteFileProperties.DestinationPathAlreadyComplete | WriteFileProperties.ParseVariables);
webProject.ProjectItems.AddFromFile(webConfigDstFile);
}
@@ -498,7 +498,7 @@
AddToStatus("Using existing testing project " + m_configuration["projects.tests.name"] + "...");
testProject = VSSolutionUtils.FindProjectByName(m_configuration["projects.tests.name"], m_applicationObject.Solution);
}
- WriteFile("Tests/App.config", m_configuration["projects.tests.dir"] + "/App.config");
+ WriteFile("Tests/App.config", m_configuration["projects.tests.dir"] + "/App.config", WriteFileProperties.RenderTemplate | WriteFileProperties.ParseVariables);
WriteFile("Tests/nhibernate.config", m_configuration["projects.tests.dir"] + "/nhibernate.config");
ProjectItem appConfig = testProject.ProjectItems.AddFromFile(m_dstPath + m_configuration["projects.tests.dir"] + "\\App.config");
1.8 +8 -2 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.cs
Index: MDASolutionWizard.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- MDASolutionWizard.cs 1 Aug 2007 05:10:39 -0000 1.7
+++ MDASolutionWizard.cs 3 Aug 2007 14:45:49 -0000 1.8
@@ -464,7 +464,7 @@
cbConfigureUnitTestingProject.Checked = true;
cbConfigureUnitTestingProject.Checked = false;
- txtAndroMDAVersion.Text = "3.2";
+ txtAndroMDAVersion.Text = "3.3-SNAPSHOT";
txtDotNetCartridgesVersion.Text = "1.2-SNAPSHOT";
}
@@ -558,7 +558,13 @@
// TODO: Support all database types that NHibernate supports
switch (ddlDatabaseType.SelectedItem.ToString())
{
- case "Microsoft SQL Server":
+ case "Microsoft SQL Server 2005":
+ config["database.mappingtype"] = "MSSQL";
+ config["database.hibernatedialect"] = "net.sf.hibernate.dialect.SQLServerDialect";
+ config["database.nhibernatedialect"] = "NHibernate.Dialect.MsSql2005Dialect";
+ config["hibernate.connection.driver_class"] = "NHibernate.Driver.SqlClientDriver";
+ break;
+ case "Microsoft SQL Server 2000":
config["database.mappingtype"] = "MSSQL";
config["database.hibernatedialect"] = "net.sf.hibernate.dialect.SQLServerDialect";
config["database.nhibernatedialect"] = "NHibernate.Dialect.MsSql2000Dialect";
1.8 +784 -783 plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.designer.cs
Index: MDASolutionWizard.designer.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.VS80AddIn/AndroMDA.VS80AddIn/Wizards/MDASolutionWizard.designer.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- MDASolutionWizard.designer.cs 1 Aug 2007 05:10:39 -0000 1.7
+++ MDASolutionWizard.designer.cs 3 Aug 2007 14:45:50 -0000 1.8
@@ -32,6 +32,33 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MDASolutionWizard));
this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.wizard1 = new Gui.Wizard.Wizard();
+ this.wizardPageAdvancedSettings = new Gui.Wizard.WizardPage();
+ this.txtDotNetCartridgesVersion = new System.Windows.Forms.TextBox();
+ this.txtAndroMDAVersion = new System.Windows.Forms.TextBox();
+ this.lblUseZippedModel = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.ddlAndroMDABootstrap = new System.Windows.Forms.ComboBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.lblUseZippedModelDescription = new System.Windows.Forms.Label();
+ this.cbUseZippedModel = new System.Windows.Forms.CheckBox();
+ this.header9 = new Gui.Wizard.Header();
+ this.wizardPageSolutionInfo = new Gui.Wizard.WizardPage();
+ this.cbShowAdvancedOptions = new System.Windows.Forms.CheckBox();
+ this.ddlVersionControl = new System.Windows.Forms.ComboBox();
+ this.ddlDatabaseType = new System.Windows.Forms.ComboBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
+ this.txtApplicationName = new System.Windows.Forms.TextBox();
+ this.label12 = new System.Windows.Forms.Label();
+ this.header6 = new Gui.Wizard.Header();
+ this.wizardPageWelcome = new Gui.Wizard.WizardPage();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
this.wizardPageComplete = new Gui.Wizard.WizardPage();
this.lnkViewLog = new System.Windows.Forms.LinkLabel();
this.lblFinishPageTitle = new System.Windows.Forms.Label();
@@ -83,34 +110,11 @@
this.wizardPageCommonProject = new Gui.Wizard.WizardPage();
this.usrCommonProject = new AndroMDA.VS80AddIn.Dialogs.MDAProjectSetupControl();
this.header1 = new Gui.Wizard.Header();
- this.wizardPageAdvancedSettings = new Gui.Wizard.WizardPage();
- this.txtAndroMDAVersion = new System.Windows.Forms.TextBox();
- this.lblUseZippedModel = new System.Windows.Forms.Label();
- this.label6 = new System.Windows.Forms.Label();
- this.ddlAndroMDABootstrap = new System.Windows.Forms.ComboBox();
- this.label5 = new System.Windows.Forms.Label();
- this.lblUseZippedModelDescription = new System.Windows.Forms.Label();
- this.cbUseZippedModel = new System.Windows.Forms.CheckBox();
- this.header9 = new Gui.Wizard.Header();
- this.wizardPageSolutionInfo = new Gui.Wizard.WizardPage();
- this.cbShowAdvancedOptions = new System.Windows.Forms.CheckBox();
- this.ddlVersionControl = new System.Windows.Forms.ComboBox();
- this.ddlDatabaseType = new System.Windows.Forms.ComboBox();
- this.label10 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
- this.label17 = new System.Windows.Forms.Label();
- this.txtApplicationName = new System.Windows.Forms.TextBox();
- this.label12 = new System.Windows.Forms.Label();
- this.header6 = new Gui.Wizard.Header();
- this.wizardPageWelcome = new Gui.Wizard.WizardPage();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.label9 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.pictureBoxWelcome = new System.Windows.Forms.PictureBox();
- this.label3 = new System.Windows.Forms.Label();
- this.txtDotNetCartridgesVersion = new System.Windows.Forms.TextBox();
this.wizard1.SuspendLayout();
+ this.wizardPageAdvancedSettings.SuspendLayout();
+ this.wizardPageSolutionInfo.SuspendLayout();
+ this.wizardPageWelcome.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
this.wizardPageComplete.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxComplete)).BeginInit();
this.wizardPageProcessing.SuspendLayout();
@@ -122,10 +126,6 @@
this.wizardPageSchemaExportProject.SuspendLayout();
this.wizardPageCoreProject.SuspendLayout();
this.wizardPageCommonProject.SuspendLayout();
- this.wizardPageAdvancedSettings.SuspendLayout();
- this.wizardPageSolutionInfo.SuspendLayout();
- this.wizardPageWelcome.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWelcome)).BeginInit();
this.SuspendLayout();
//
// imageList1
@@ -171,905 +171,906 @@
this.wizard1.TabIndex = 0;
this.wizard1.Load += new System.EventHandler(this.wizard1_Load);
//
- // wizardPageComplete
+ // wizardPageAdvancedSettings
//
- this.wizardPageComplete.BackColor = System.Drawing.Color.White;
- this.wizardPageComplete.Controls.Add(this.lnkViewLog);
- this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle);
- this.wizardPageComplete.Controls.Add(this.pictureBoxComplete);
- this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription);
- this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage);
- this.wizardPageComplete.Controls.Add(this.txtErrorMessage);
- this.wizardPageComplete.Controls.Add(this.lstLog);
- this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageComplete.IsFinishPage = true;
- this.wizardPageComplete.Location = new System.Drawing.Point(0, 0);
- this.wizardPageComplete.Name = "wizardPageComplete";
- this.wizardPageComplete.Size = new System.Drawing.Size(525, 312);
- this.wizardPageComplete.TabIndex = 7;
- this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
+ this.wizardPageAdvancedSettings.Controls.Add(this.txtDotNetCartridgesVersion);
+ this.wizardPageAdvancedSettings.Controls.Add(this.txtAndroMDAVersion);
+ this.wizardPageAdvancedSettings.Controls.Add(this.lblUseZippedModel);
+ this.wizardPageAdvancedSettings.Controls.Add(this.label3);
+ this.wizardPageAdvancedSettings.Controls.Add(this.label6);
+ this.wizardPageAdvancedSettings.Controls.Add(this.ddlAndroMDABootstrap);
+ this.wizardPageAdvancedSettings.Controls.Add(this.label5);
+ this.wizardPageAdvancedSettings.Controls.Add(this.lblUseZippedModelDescription);
+ this.wizardPageAdvancedSettings.Controls.Add(this.cbUseZippedModel);
+ this.wizardPageAdvancedSettings.Controls.Add(this.header9);
+ this.wizardPageAdvancedSettings.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageAdvancedSettings.IsFinishPage = false;
+ this.wizardPageAdvancedSettings.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageAdvancedSettings.Name = "wizardPageAdvancedSettings";
+ this.wizardPageAdvancedSettings.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageAdvancedSettings.TabIndex = 11;
+ this.wizardPageAdvancedSettings.ShowFromBack += new System.EventHandler(this.wizardPageAdvancedSettings_ShowFromBack);
+ this.wizardPageAdvancedSettings.ShowFromNext += new System.EventHandler(this.wizardPageAdvancedSettings_ShowFromNext);
//
- // lnkViewLog
+ // txtDotNetCartridgesVersion
//
- this.lnkViewLog.AutoSize = true;
- this.lnkViewLog.Location = new System.Drawing.Point(210, 111);
- this.lnkViewLog.Name = "lnkViewLog";
- this.lnkViewLog.Size = new System.Drawing.Size(49, 13);
- this.lnkViewLog.TabIndex = 16;
- this.lnkViewLog.TabStop = true;
- this.lnkViewLog.Text = "View Log";
- this.lnkViewLog.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
+ this.txtDotNetCartridgesVersion.BackColor = System.Drawing.SystemColors.Window;
+ this.txtDotNetCartridgesVersion.Location = new System.Drawing.Point(30, 152);
+ this.txtDotNetCartridgesVersion.Name = "txtDotNetCartridgesVersion";
+ this.txtDotNetCartridgesVersion.Size = new System.Drawing.Size(394, 21);
+ this.txtDotNetCartridgesVersion.TabIndex = 1;
//
- // lblFinishPageTitle
+ // txtAndroMDAVersion
//
- this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lblFinishPageTitle.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblFinishPageTitle.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
- this.lblFinishPageTitle.Location = new System.Drawing.Point(209, 9);
- this.lblFinishPageTitle.Name = "lblFinishPageTitle";
- this.lblFinishPageTitle.Size = new System.Drawing.Size(299, 36);
- this.lblFinishPageTitle.TabIndex = 15;
- this.lblFinishPageTitle.Text = "Solution Update Complete";
- this.lblFinishPageTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.txtAndroMDAVersion.BackColor = System.Drawing.SystemColors.Window;
+ this.txtAndroMDAVersion.Location = new System.Drawing.Point(30, 103);
+ this.txtAndroMDAVersion.Name = "txtAndroMDAVersion";
+ this.txtAndroMDAVersion.Size = new System.Drawing.Size(394, 21);
+ this.txtAndroMDAVersion.TabIndex = 1;
//
- // pictureBoxComplete
+ // lblUseZippedModel
//
- this.pictureBoxComplete.Dock = System.Windows.Forms.DockStyle.Left;
- this.pictureBoxComplete.Image = global::AndroMDA.VS80AddIn.Resource1.orange;
- this.pictureBoxComplete.Location = new System.Drawing.Point(0, 0);
- this.pictureBoxComplete.Name = "pictureBoxComplete";
- this.pictureBoxComplete.Size = new System.Drawing.Size(164, 312);
- this.pictureBoxComplete.TabIndex = 13;
- this.pictureBoxComplete.TabStop = false;
+ this.lblUseZippedModel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblUseZippedModel.Location = new System.Drawing.Point(9, 228);
+ this.lblUseZippedModel.Name = "lblUseZippedModel";
+ this.lblUseZippedModel.Size = new System.Drawing.Size(507, 16);
+ this.lblUseZippedModel.TabIndex = 32;
+ this.lblUseZippedModel.Text = "Do you want to use a zipped model file?";
+ this.lblUseZippedModel.Visible = false;
//
- // lblFinishPageDescription
+ // label3
//
- this.lblFinishPageDescription.Location = new System.Drawing.Point(210, 49);
- this.lblFinishPageDescription.Name = "lblFinishPageDescription";
- this.lblFinishPageDescription.Size = new System.Drawing.Size(298, 62);
- this.lblFinishPageDescription.TabIndex = 12;
- this.lblFinishPageDescription.Text = "Your solution has been updated successfully and now supports AndroMDA code genera" +
- "tion. You can now add classes to the solution model file and generate code base" +
- "d on the model.\r\n";
+ this.label3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label3.Location = new System.Drawing.Point(9, 130);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(507, 16);
+ this.label3.TabIndex = 32;
+ this.label3.Text = "What version of the .NET cartridges should your project use?";
//
- // lblFinishPageTitleImage
+ // label6
//
- this.lblFinishPageTitleImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lblFinishPageTitleImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblFinishPageTitleImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
- this.lblFinishPageTitleImage.ImageIndex = 0;
- this.lblFinishPageTitleImage.ImageList = this.imageList1;
- this.lblFinishPageTitleImage.Location = new System.Drawing.Point(170, 9);
- this.lblFinishPageTitleImage.Name = "lblFinishPageTitleImage";
- this.lblFinishPageTitleImage.Size = new System.Drawing.Size(49, 36);
- this.lblFinishPageTitleImage.TabIndex = 11;
- this.lblFinishPageTitleImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.label6.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label6.Location = new System.Drawing.Point(9, 81);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(507, 16);
+ this.label6.TabIndex = 32;
+ this.label6.Text = "What version of AndroMDA should your project use?";
//
- // txtErrorMessage
+ // ddlAndroMDABootstrap
//
- this.txtErrorMessage.BackColor = System.Drawing.Color.White;
- this.txtErrorMessage.Location = new System.Drawing.Point(174, 49);
- this.txtErrorMessage.Multiline = true;
- this.txtErrorMessage.Name = "txtErrorMessage";
- this.txtErrorMessage.ReadOnly = true;
- this.txtErrorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.txtErrorMessage.Size = new System.Drawing.Size(334, 230);
- this.txtErrorMessage.TabIndex = 14;
+ this.ddlAndroMDABootstrap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.ddlAndroMDABootstrap.FormattingEnabled = true;
+ this.ddlAndroMDABootstrap.Items.AddRange(new object[] {
+ "Apache Maven 2.x",
+ "Apache Maven 1.x"});
+ this.ddlAndroMDABootstrap.Location = new System.Drawing.Point(30, 201);
+ this.ddlAndroMDABootstrap.Name = "ddlAndroMDABootstrap";
+ this.ddlAndroMDABootstrap.Size = new System.Drawing.Size(394, 21);
+ this.ddlAndroMDABootstrap.TabIndex = 0;
+ this.ddlAndroMDABootstrap.Visible = false;
+ this.ddlAndroMDABootstrap.SelectedIndexChanged += new System.EventHandler(this.ddlAndroMDABootstrap_SelectedIndexChanged);
//
- // lstLog
+ // label5
//
- this.lstLog.FormattingEnabled = true;
- this.lstLog.HorizontalScrollbar = true;
- this.lstLog.Location = new System.Drawing.Point(174, 49);
- this.lstLog.Name = "lstLog";
- this.lstLog.Size = new System.Drawing.Size(339, 251);
- this.lstLog.TabIndex = 17;
- this.lstLog.Visible = false;
+ this.label5.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label5.Location = new System.Drawing.Point(9, 179);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(507, 16);
+ this.label5.TabIndex = 30;
+ this.label5.Text = "Which program should your project use to launch AndroMDA?";
+ this.label5.Visible = false;
//
- // wizardPageProcessing
+ // lblUseZippedModelDescription
//
- this.wizardPageProcessing.Controls.Add(this.pictureBoxThrobber);
- this.wizardPageProcessing.Controls.Add(this.lstStatus);
- this.wizardPageProcessing.Controls.Add(this.label7);
- this.wizardPageProcessing.Controls.Add(this.header5);
- this.wizardPageProcessing.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageProcessing.IsFinishPage = false;
- this.wizardPageProcessing.Location = new System.Drawing.Point(0, 0);
- this.wizardPageProcessing.Name = "wizardPageProcessing";
- this.wizardPageProcessing.Size = new System.Drawing.Size(525, 312);
- this.wizardPageProcessing.TabIndex = 6;
- this.wizardPageProcessing.ShowFromNext += new System.EventHandler(this.wizardPageProcessing_ShowFromNext);
+ this.lblUseZippedModelDescription.Location = new System.Drawing.Point(27, 267);
+ this.lblUseZippedModelDescription.Name = "lblUseZippedModelDescription";
+ this.lblUseZippedModelDescription.Size = new System.Drawing.Size(428, 30);
+ this.lblUseZippedModelDescription.TabIndex = 29;
+ this.lblUseZippedModelDescription.Text = "This option will instruct the wizard to emit the empty model as an XMI file insid" +
+ "e a zip file, instead of plain XMI file";
+ this.lblUseZippedModelDescription.Visible = false;
//
- // pictureBoxThrobber
+ // cbUseZippedModel
//
- this.pictureBoxThrobber.BackColor = System.Drawing.Color.Transparent;
- this.pictureBoxThrobber.Image = global::AndroMDA.VS80AddIn.Resource1.indicator_arrows;
- this.pictureBoxThrobber.Location = new System.Drawing.Point(227, 77);
- this.pictureBoxThrobber.Name = "pictureBoxThrobber";
- this.pictureBoxThrobber.Size = new System.Drawing.Size(31, 17);
- this.pictureBoxThrobber.TabIndex = 10;
- this.pictureBoxThrobber.TabStop = false;
+ this.cbUseZippedModel.AutoSize = true;
+ this.cbUseZippedModel.Enabled = false;
+ this.cbUseZippedModel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.cbUseZippedModel.Location = new System.Drawing.Point(30, 248);
+ this.cbUseZippedModel.Name = "cbUseZippedModel";
+ this.cbUseZippedModel.Size = new System.Drawing.Size(126, 17);
+ this.cbUseZippedModel.TabIndex = 2;
+ this.cbUseZippedModel.Text = "Use zipped model file";
+ this.cbUseZippedModel.UseVisualStyleBackColor = true;
+ this.cbUseZippedModel.Visible = false;
//
- // lstStatus
- //
- this.lstStatus.FormattingEnabled = true;
- this.lstStatus.Location = new System.Drawing.Point(12, 100);
- this.lstStatus.Name = "lstStatus";
- this.lstStatus.Size = new System.Drawing.Size(501, 199);
- this.lstStatus.TabIndex = 9;
- //
- // label7
+ // header9
//
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(12, 77);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(209, 13);
- this.label7.TabIndex = 8;
- this.label7.Text = "Updating solution to support AndroMDA...";
+ this.header9.BackColor = System.Drawing.SystemColors.Control;
+ this.header9.CausesValidation = false;
+ this.header9.Description = "You can fine tune the output of the solution wizard with these settings.";
+ this.header9.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header9.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
+ this.header9.Location = new System.Drawing.Point(0, 0);
+ this.header9.Name = "header9";
+ this.header9.Size = new System.Drawing.Size(525, 65);
+ this.header9.TabIndex = 27;
+ this.header9.Title = "Advanced Settings";
//
- // header5
+ // wizardPageSolutionInfo
//
- this.header5.BackColor = System.Drawing.SystemColors.Control;
- this.header5.CausesValidation = false;
- this.header5.Description = "Please wait...";
- this.header5.Dock = System.Windows.Forms.DockStyle.Top;
- this.header5.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header5.Location = new System.Drawing.Point(0, 0);
- this.header5.Name = "header5";
- this.header5.Size = new System.Drawing.Size(525, 65);
- this.header5.TabIndex = 6;
- this.header5.Title = "Processing Solution";
+ this.wizardPageSolutionInfo.Controls.Add(this.cbShowAdvancedOptions);
+ this.wizardPageSolutionInfo.Controls.Add(this.ddlVersionControl);
+ this.wizardPageSolutionInfo.Controls.Add(this.ddlDatabaseType);
+ this.wizardPageSolutionInfo.Controls.Add(this.label10);
+ this.wizardPageSolutionInfo.Controls.Add(this.label1);
+ this.wizardPageSolutionInfo.Controls.Add(this.label17);
+ this.wizardPageSolutionInfo.Controls.Add(this.txtApplicationName);
+ this.wizardPageSolutionInfo.Controls.Add(this.label12);
+ this.wizardPageSolutionInfo.Controls.Add(this.header6);
+ this.wizardPageSolutionInfo.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageSolutionInfo.IsFinishPage = false;
+ this.wizardPageSolutionInfo.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageSolutionInfo.Name = "wizardPageSolutionInfo";
+ this.wizardPageSolutionInfo.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageSolutionInfo.TabIndex = 8;
+ this.wizardPageSolutionInfo.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageSolutionInfo_CloseFromNext);
+ this.wizardPageSolutionInfo.ShowFromBack += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
+ this.wizardPageSolutionInfo.ShowFromNext += new System.EventHandler(this.wizardPageSolutionInfo_ShowFromNext);
//
- // wizardPageConfirmChoices
+ // cbShowAdvancedOptions
//
- this.wizardPageConfirmChoices.Controls.Add(this.lstChoiceOverview);
- this.wizardPageConfirmChoices.Controls.Add(this.header4);
- this.wizardPageConfirmChoices.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageConfirmChoices.IsFinishPage = false;
- this.wizardPageConfirmChoices.Location = new System.Drawing.Point(0, 0);
- this.wizardPageConfirmChoices.Name = "wizardPageConfirmChoices";
- this.wizardPageConfirmChoices.Size = new System.Drawing.Size(525, 312);
- this.wizardPageConfirmChoices.TabIndex = 5;
- this.wizardPageConfirmChoices.ShowFromNext += new System.EventHandler(this.wizardPageConfirmChoices_ShowFromNext);
+ this.cbShowAdvancedOptions.AutoSize = true;
+ this.cbShowAdvancedOptions.Location = new System.Drawing.Point(30, 249);
+ this.cbShowAdvancedOptions.Name = "cbShowAdvancedOptions";
+ this.cbShowAdvancedOptions.Size = new System.Drawing.Size(140, 17);
+ this.cbShowAdvancedOptions.TabIndex = 3;
+ this.cbShowAdvancedOptions.Text = "Show advanced options";
+ this.cbShowAdvancedOptions.UseVisualStyleBackColor = true;
//
- // lstChoiceOverview
+ // ddlVersionControl
//
- this.lstChoiceOverview.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.columnHeader1,
- this.columnHeader2});
- this.lstChoiceOverview.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.lstChoiceOverview.Location = new System.Drawing.Point(12, 71);
- this.lstChoiceOverview.Name = "lstChoiceOverview";
- this.lstChoiceOverview.Size = new System.Drawing.Size(501, 228);
- this.lstChoiceOverview.TabIndex = 6;
- this.lstChoiceOverview.UseCompatibleStateImageBehavior = false;
- this.lstChoiceOverview.View = System.Windows.Forms.View.Details;
+ this.ddlVersionControl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.ddlVersionControl.FormattingEnabled = true;
+ this.ddlVersionControl.Items.AddRange(new object[] {
+ "None",
+ "CVS"});
+ this.ddlVersionControl.Location = new System.Drawing.Point(30, 201);
+ this.ddlVersionControl.Name = "ddlVersionControl";
+ this.ddlVersionControl.Size = new System.Drawing.Size(394, 21);
+ this.ddlVersionControl.TabIndex = 2;
//
- // columnHeader1
+ // ddlDatabaseType
//
- this.columnHeader1.Text = "Feature";
- this.columnHeader1.Width = 236;
+ this.ddlDatabaseType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.ddlDatabaseType.FormattingEnabled = true;
+ this.ddlDatabaseType.Items.AddRange(new object[] {
+ "Microsoft SQL Server 2005",
+ "Microsoft SQL Server 2000",
+ "MySQL",
+ "Oracle 9i",
+ "PostgreSQL",
+ "Hypersonic"});
+ this.ddlDatabaseType.Location = new System.Drawing.Point(30, 152);
+ this.ddlDatabaseType.Name = "ddlDatabaseType";
+ this.ddlDatabaseType.Size = new System.Drawing.Size(394, 21);
+ this.ddlDatabaseType.TabIndex = 1;
//
- // columnHeader2
+ // label10
//
- this.columnHeader2.Text = "Value";
- this.columnHeader2.Width = 235;
+ this.label10.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label10.Location = new System.Drawing.Point(9, 230);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(507, 16);
+ this.label10.TabIndex = 6;
+ this.label10.Text = "Would you like to use a specific version of AndroMDA?";
//
- // header4
+ // label1
//
- this.header4.BackColor = System.Drawing.SystemColors.Control;
- this.header4.CausesValidation = false;
- this.header4.Description = "Please confirm the choices you have selected. Click Next to begin processing you" +
- "r solution.";
- this.header4.Dock = System.Windows.Forms.DockStyle.Top;
- this.header4.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header4.Location = new System.Drawing.Point(0, 0);
- this.header4.Name = "header4";
- this.header4.Size = new System.Drawing.Size(525, 65);
- this.header4.TabIndex = 5;
- this.header4.Title = "Confirm Choices";
+ this.label1.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label1.Location = new System.Drawing.Point(9, 179);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(507, 16);
+ this.label1.TabIndex = 6;
+ this.label1.Text = "Which version control system will you be using, if any?";
//
- // wizardPageWebCommonProject
+ // label17
//
- this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelectedImage);
- this.wizardPageWebCommonProject.Controls.Add(this.lblMembershipSelected);
- this.wizardPageWebCommonProject.Controls.Add(this.cbConfigureWebCommonProject);
- this.wizardPageWebCommonProject.Controls.Add(this.usrWebCommonProject);
- this.wizardPageWebCommonProject.Controls.Add(this.header8);
- this.wizardPageWebCommonProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageWebCommonProject.IsFinishPage = false;
- this.wizardPageWebCommonProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageWebCommonProject.Name = "wizardPageWebCommonProject";
- this.wizardPageWebCommonProject.Size = new System.Drawing.Size(525, 312);
- this.wizardPageWebCommonProject.TabIndex = 10;
- this.wizardPageWebCommonProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebCommonProject_CloseFromNext);
- this.wizardPageWebCommonProject.ShowFromBack += new System.EventHandler(this.wizardPageWebCommonProject_ShowFromBack);
- this.wizardPageWebCommonProject.ShowFromNext += new System.EventHandler(this.wizardPageWebCommonProject_ShowFromNext);
+ this.label17.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label17.Location = new System.Drawing.Point(9, 130);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(507, 16);
+ this.label17.TabIndex = 4;
+ this.label17.Text = "Which database server will your application use?";
//
- // lblMembershipSelectedImage
+ // txtApplicationName
//
- this.lblMembershipSelectedImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.lblMembershipSelectedImage.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblMembershipSelectedImage.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
- this.lblMembershipSelectedImage.ImageIndex = 0;
- this.lblMembershipSelectedImage.ImageList = this.imageList1;
- this.lblMembershipSelectedImage.Location = new System.Drawing.Point(48, 210);
- this.lblMembershipSelectedImage.Name = "lblMembershipSelectedImage";
- this.lblMembershipSelectedImage.Size = new System.Drawing.Size(35, 36);
- this.lblMembershipSelectedImage.TabIndex = 36;
- this.lblMembershipSelectedImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.lblMembershipSelectedImage.Visible = false;
+ this.txtApplicationName.BackColor = System.Drawing.SystemColors.Window;
+ this.txtApplicationName.Location = new System.Drawing.Point(30, 103);
+ this.txtApplicationName.Name = "txtApplicationName";
+ this.txtApplicationName.Size = new System.Drawing.Size(394, 21);
+ this.txtApplicationName.TabIndex = 0;
//
- // lblMembershipSelected
+ // label12
//
- this.lblMembershipSelected.Location = new System.Drawing.Point(89, 210);
- this.lblMembershipSelected.Name = "lblMembershipSelected";
- this.lblMembershipSelected.Size = new System.Drawing.Size(357, 47);
- this.lblMembershipSelected.TabIndex = 35;
- this.lblMembershipSelected.Text = "You selected membership support on the previous page which requires a web common " +
- "project. Please enter the name of the new project or select an existing class l" +
- "ibrary project.";
- this.lblMembershipSelected.Visible = false;
+ this.label12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label12.Location = new System.Drawing.Point(9, 81);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(507, 16);
+ this.label12.TabIndex = 0;
+ this.label12.Text = "What is the name of your application? (Example: Time Tracker)";
//
- // cbConfigureWebCommonProject
+ // header6
//
- this.cbConfigureWebCommonProject.AutoSize = true;
- this.cbConfigureWebCommonProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbConfigureWebCommonProject.Location = new System.Drawing.Point(12, 80);
- this.cbConfigureWebCommonProject.Name = "cbConfigureWebCommonProject";
- this.cbConfigureWebCommonProject.Size = new System.Drawing.Size(202, 17);
- this.cbConfigureWebCommonProject.TabIndex = 0;
- this.cbConfigureWebCommonProject.Text = "Configure web common project";
- this.cbConfigureWebCommonProject.UseVisualStyleBackColor = true;
- this.cbConfigureWebCommonProject.CheckedChanged += new System.EventHandler(this.cbEnableWebCommonProject_CheckedChanged);
+ this.header6.BackColor = System.Drawing.SystemColors.Control;
+ this.header6.CausesValidation = false;
+ this.header6.Description = "Please enter the following general information about your applicaiton.";
+ this.header6.Dock = System.Windows.Forms.DockStyle.Top;
+ this.header6.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
+ this.header6.Location = new System.Drawing.Point(0, 0);
+ this.header6.Name = "header6";
+ this.header6.Size = new System.Drawing.Size(525, 65);
+ this.header6.TabIndex = 26;
+ this.header6.Title = "Application Information";
//
- // usrWebCommonProject
+ // wizardPageWelcome
//
- this.usrWebCommonProject.Location = new System.Drawing.Point(30, 102);
- this.usrWebCommonProject.Name = "usrWebCommonProject";
- this.usrWebCommonProject.ProjectName = "";
- this.usrWebCommonProject.Size = new System.Drawing.Size(416, 93);
- this.usrWebCommonProject.TabIndex = 1;
+ this.wizardPageWelcome.BackColor = System.Drawing.Color.White;
+ this.wizardPageWelcome.Controls.Add(this.groupBox1);
+ this.wizardPageWelcome.Controls.Add(this.label9);
+ this.wizardPageWelcome.Controls.Add(this.label2);
+ this.wizardPageWelcome.Controls.Add(this.label8);
+ this.wizardPageWelcome.Controls.Add(this.pictureBoxWelcome);
+ this.wizardPageWelcome.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageWelcome.IsFinishPage = false;
+ this.wizardPageWelcome.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageWelcome.Name = "wizardPageWelcome";
+ this.wizardPageWelcome.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageWelcome.TabIndex = 1;
//
- // header8
+ // groupBox1
//
- this.header8.BackColor = System.Drawing.SystemColors.Control;
- this.header8.CausesValidation = false;
- this.header8.Description = "The web common project is a class library that contains web site support classes." +
- "";
- this.header8.Dock = System.Windows.Forms.DockStyle.Top;
- this.header8.Image = global::AndroMDA.VS80AddIn.Resource1.rightbox;
- this.header8.Location = new System.Drawing.Point(0, 0);
- this.header8.Name = "header8";
- this.header8.Size = new System.Drawing.Size(525, 65);
- this.header8.TabIndex = 28;
- this.header8.Title = "Web Common Project";
+ this.groupBox1.Location = new System.Drawing.Point(173, 31);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(345, 4);
+ this.groupBox1.TabIndex = 10;
+ this.groupBox1.TabStop = false;
//
- // wizardPageWebProject
+ // label9
//
- this.wizardPageWebProject.Controls.Add(this.cbConfigureWebProject);
- this.wizardPageWebProject.Controls.Add(this.usrWebProject);
- this.wizardPageWebProject.Controls.Add(this.lblASPNETCartridge);
- this.wizardPageWebProject.Controls.Add(this.lblStoreSettingsInNHibernateConfigDescription);
- this.wizardPageWebProject.Controls.Add(this.lblAddMembershipSupportText);
- this.wizardPageWebProject.Controls.Add(this.cbConfigureASPNETCartridge);
- this.wizardPageWebProject.Controls.Add(this.cbUseNHibernateConfig);
- this.wizardPageWebProject.Controls.Add(this.cbAddMembershipSupport);
- this.wizardPageWebProject.Controls.Add(this.header7);
- this.wizardPageWebProject.Dock = System.Windows.Forms.DockStyle.Fill;
- this.wizardPageWebProject.IsFinishPage = false;
- this.wizardPageWebProject.Location = new System.Drawing.Point(0, 0);
- this.wizardPageWebProject.Name = "wizardPageWebProject";
- this.wizardPageWebProject.Size = new System.Drawing.Size(525, 312);
- this.wizardPageWebProject.TabIndex = 9;
- this.wizardPageWebProject.CloseFromNext += new Gui.Wizard.PageEventHandler(this.wizardPageWebProject_CloseFromNext);
- this.wizardPageWebProject.ShowFromNext += new System.EventHandler(this.wizardPageWebProject_ShowFromNext);
+ this.label9.Location = new System.Drawing.Point(180, 60);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(339, 220);
+ this.label9.TabIndex = 9;
+ this.label9.Text = resources.GetString("label9.Text");
//
- // cbConfigureWebProject
+ // label2
//
- this.cbConfigureWebProject.AutoSize = true;
- this.cbConfigureWebProject.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbConfigureWebProject.Location = new System.Drawing.Point(12, 80);
- this.cbConfigureWebProject.Name = "cbConfigureWebProject";
- this.cbConfigureWebProject.Size = new System.Drawing.Size(150, 17);
- this.cbConfigureWebProject.TabIndex = 0;
- this.cbConfigureWebProject.Text = "Configure web project";
- this.cbConfigureWebProject.UseVisualStyleBackColor = true;
- this.cbConfigureWebProject.CheckedChanged += new System.EventHandler(this.cbAddWebProjectSupport_CheckedChanged);
+ this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.label2.FlatStyle = System.Windows.Forms.FlatStyle.System;
+ this.label2.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label2.Location = new System.Drawing.Point(173, 38);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(343, 23);
+ this.label2.TabIndex = 8;
+ this.label2.Text = "Welcome";
//
- // usrWebProject
+ // label8
//
- this.usrWebProject.Location = new System.Drawing.Point(30, 102);
- this.usrWebProject.Name = "usrWebProject";
- this.usrWebProject.ProjectName = "";
- this.usrWebProject.Size = new System.Drawing.Size(431, 93);
- this.usrWebProject.TabIndex = 1;
- this.usrWebProject.WebProjectMode = true;
+ this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.label8.FlatStyle = System.Windows.Forms.FlatStyle.System;
+ this.label8.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label8.Location = new System.Drawing.Point(173, 9);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(343, 23);
+ this.label8.TabIndex = 8;
+ this.label8.Text = "AndroMDA Solution Wizard";
//
- // lblASPNETCartridge
+ // pictureBoxWelcome
//
- this.lblASPNETCartridge.Location = new System.Drawing.Point(287, 271);
- this.lblASPNETCartridge.Name = "lblASPNETCartridge";
- this.lblASPNETCartridge.Size = new System.Drawing.Size(225, 30);
- this.lblASPNETCartridge.TabIndex = 3;
- this.lblASPNETCartridge.Text = "Configure and enable the ASP.NET cartridge. Note: This feature is experimental";
- this.lblASPNETCartridge.Click += new System.EventHandler(this.lblStoreSettingsInNHibernateConfigDescription_Click);
+ this.pictureBoxWelcome.Dock = System.Windows.Forms.DockStyle.Left;
+ this.pictureBoxWelcome.Image = global::AndroMDA.VS80AddIn.Resource1.orange;
+ this.pictureBoxWelcome.Location = new System.Drawing.Point(0, 0);
+ this.pictureBoxWelcome.Name = "pictureBoxWelcome";
+ this.pictureBoxWelcome.Size = new System.Drawing.Size(164, 312);
+ this.pictureBoxWelcome.TabIndex = 1;
+ this.pictureBoxWelcome.TabStop = false;
//
- // lblStoreSettingsInNHibernateConfigDescription
+ // wizardPageComplete
//
- this.lblStoreSettingsInNHibernateConfigDescription.Location = new System.Drawing.Point(47, 271);
- this.lblStoreSettingsInNHibernateConfigDescription.Name = "lblStoreSettingsInNHibernateConfigDescription";
- this.lblStoreSettingsInNHibernateConfigDescription.Size = new System.Drawing.Size(261, 30);
- this.lblStoreSettingsInNHibernateConfigDescription.TabIndex = 3;
- this.lblStoreSettingsInNHibernateConfigDescription.Text = "Store the database connection settings in nhibernate.config instead of the web.co" +
- "nfig";
- this.lblStoreSettingsInNHibernateConfigDescription.Click += new System.EventHandler(this.lblStoreSettingsInNHibernateConfigDescription_Click);
+ this.wizardPageComplete.BackColor = System.Drawing.Color.White;
+ this.wizardPageComplete.Controls.Add(this.lnkViewLog);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageTitle);
+ this.wizardPageComplete.Controls.Add(this.pictureBoxComplete);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageDescription);
+ this.wizardPageComplete.Controls.Add(this.lblFinishPageTitleImage);
+ this.wizardPageComplete.Controls.Add(this.txtErrorMessage);
+ this.wizardPageComplete.Controls.Add(this.lstLog);
+ this.wizardPageComplete.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.wizardPageComplete.IsFinishPage = true;
+ this.wizardPageComplete.Location = new System.Drawing.Point(0, 0);
+ this.wizardPageComplete.Name = "wizardPageComplete";
+ this.wizardPageComplete.Size = new System.Drawing.Size(525, 312);
+ this.wizardPageComplete.TabIndex = 7;
+ this.wizardPageComplete.ShowFromNext += new System.EventHandler(this.wizardPageComplete_ShowFromNext);
//
- // lblAddMembershipSupportText
+ // lnkViewLog
//
- this.lblAddMembershipSupportText.Location = new System.Drawing.Point(47, 221);
- this.lblAddMembershipSupportText.Name = "lblAddMembershipSupportText";
- this.lblAddMembershipSupportText.Size = new System.Drawing.Size(222, 30);
- this.lblAddMembershipSupportText.TabIndex = 3;
- this.lblAddMembershipSupportText.Text = "This options adds users and roles to the UML model and full ASP.NET Membership su" +
- "pport to the solution.";
- this.lblAddMembershipSupportText.Click += new System.EventHandler(this.lblAddMembershipSupportText_Click);
+ this.lnkViewLog.AutoSize = true;
+ this.lnkViewLog.Location = new System.Drawing.Point(210, 111);
+ this.lnkViewLog.Name = "lnkViewLog";
+ this.lnkViewLog.Size = new System.Drawing.Size(49, 13);
+ this.lnkViewLog.TabIndex = 16;
+ this.lnkViewLog.TabStop = true;
+ this.lnkViewLog.Text = "View Log";
+ this.lnkViewLog.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
- // cbConfigureASPNETCartridge
+ // lblFinishPageTitle
//
- this.cbConfigureASPNETCartridge.AutoSize = true;
- this.cbConfigureASPNETCartridge.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cbConfigureASPNETCartridge.Location = new System.Drawing.Point(270, 254);
- this.cbConfigureASPNETCartridge.Name = "cbConfigureASPNETCartridge";
- this.cbConfigureASPNETCartridge.Size = new System.Drawing.Size(137, 17);
- this.cbConfigureASPNETCartridge.TabIndex = 2;
- this.cbConfigureASPNETCartridge.Text = "Use ASP.NET Cartridge";
- this.cbConfigureASPNETCartridge.UseVisualStyleBackColor = true;
- this.cbConfigureASPNETCartridge.CheckedChanged += new System.EventHandler(this.cbAddMembershipSupport_CheckedChanged);
+ this.lblFinishPageTitle.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.An...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2007-08-01 05:20:26
|
User: cmicali
Date: 07/07/31 22:20:29
Modified: andromda-nhibernate/src/main/uml
HibernateMetafacadeModel.xml.zip
Log:
- Reverted to old model
Revision Changes Path
1.5 +88 -1169 cartridges/andromda-nhibernate/src/main/uml/HibernateMetafacadeModel.xml.zip
<<Binary file>>
|
|
From: Chris M. <cm...@us...> - 2007-08-01 05:11:59
|
User: cmicali
Date: 07/07/31 22:12:02
Modified: etc/andromda-dotnet/Lib/AndroMDA.NHibernateSupport
AndroMDA.NHibernateSupport.dll
etc/andromda-dotnet/Lib/AndroMDA.ScenarioUnit
AndroMDA.ScenarioUnit.dll
etc/andromda-dotnet/Lib/NHibernateContrib
NHibernate.Caches.Prevalence.dll
NHibernate.Caches.SysCache.dll
etc/andromda-dotnet/Lib/NHibernate Castle.DynamicProxy.dll
Iesi.Collections.dll NHibernate.dll log4net.dll
Added: etc/andromda-dotnet/Lib/NHibernateContrib
Nullables.NHibernate.dll Nullables.dll
Log:
- Updated NHibernate version from 1.04 to 1.2
- Updated versions of all NHibernate dependencies
- Updated membership code to work with new v1.2-SNAPSHOT cartridges and NHibernate 1.2
- Set default solution wizard cartridge version to 1.2-SNAPSHOT
Revision Changes Path
1.5 +177 -190 plugins/etc/andromda-dotnet/Lib/AndroMDA.NHibernateSupport/AndroMDA.NHibernateSupport.dll
<<Binary file>>
1.2 +157 -145 plugins/etc/andromda-dotnet/Lib/AndroMDA.ScenarioUnit/AndroMDA.ScenarioUnit.dll
<<Binary file>>
1.2 +135 -103 plugins/etc/andromda-dotnet/Lib/NHibernateContrib/NHibernate.Caches.Prevalence.dll
<<Binary file>>
1.2 +170 -181 plugins/etc/andromda-dotnet/Lib/NHibernateContrib/NHibernate.Caches.SysCache.dll
<<Binary file>>
1.1 plugins/etc/andromda-dotnet/Lib/NHibernateContrib/Nullables.NHibernate.dll
<<Binary file>>
1.1 plugins/etc/andromda-dotnet/Lib/NHibernateContrib/Nullables.dll
<<Binary file>>
1.2 +1515 -1164plugins/etc/andromda-dotnet/Lib/NHibernate/Castle.DynamicProxy.dll
<<Binary file>>
1.2 +611 -195 plugins/etc/andromda-dotnet/Lib/NHibernate/Iesi.Collections.dll
<<Binary file>>
1.2 +20189 -14604plugins/etc/andromda-dotnet/Lib/NHibernate/NHibernate.dll
<<Binary file>>
1.2 +4735 -4458plugins/etc/andromda-dotnet/Lib/NHibernate/log4net.dll
<<Binary file>>
|
|
From: Chris M. <cm...@us...> - 2007-08-01 05:09:24
|
User: cmicali
Date: 07/07/31 22:09:26
Modified: etc/andromda-dotnet/AndroMDA.ScenarioUnit/Lib nunit.core.dll
nunit.framework.dll
Log:
- Updated NHibernate version from 1.04 to 1.2
- Updated versions of all NHibernate dependencies
- Updated membership code to work with new v1.2-SNAPSHOT cartridges and NHibernate 1.2
- Set default solution wizard cartridge version to 1.2-SNAPSHOT
Revision Changes Path
1.2 +1272 -1458plugins/etc/andromda-dotnet/AndroMDA.ScenarioUnit/Lib/nunit.core.dll
<<Binary file>>
1.2 +316 -455 plugins/etc/andromda-dotnet/AndroMDA.ScenarioUnit/Lib/nunit.framework.dll
<<Binary file>>
|
|
From: Chris M. <cm...@us...> - 2007-08-01 05:09:11
|
User: cmicali
Date: 07/07/31 22:09:15
Modified: etc/andromda-dotnet/AndroMDA.ScenarioUnit/AndroMDA.ScenarioUnit/Properties
AssemblyInfo.cs
Log:
- Updated NHibernate version from 1.04 to 1.2
- Updated versions of all NHibernate dependencies
- Updated membership code to work with new v1.2-SNAPSHOT cartridges and NHibernate 1.2
- Set default solution wizard cartridge version to 1.2-SNAPSHOT
Revision Changes Path
1.4 +2 -2 plugins/etc/andromda-dotnet/AndroMDA.ScenarioUnit/AndroMDA.ScenarioUnit/Properties/AssemblyInfo.cs
Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.ScenarioUnit/AndroMDA.ScenarioUnit/Properties/AssemblyInfo.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AssemblyInfo.cs 6 Mar 2007 10:44:54 -0000 1.3
+++ AssemblyInfo.cs 1 Aug 2007 05:09:15 -0000 1.4
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.3.0")]
|
|
From: Chris M. <cm...@us...> - 2007-08-01 05:09:05
|
User: cmicali
Date: 07/07/31 22:09:03
Modified: etc/andromda-dotnet/AndroMDA.NHibernateSupport
AssemblyInfo.cs
etc/andromda-dotnet/AndroMDA.VS80AddIn Android VS Readme.rtf
etc/andromda-dotnet/Lib DLL Versions.txt
Log:
- Updated NHibernate version from 1.04 to 1.2
- Updated versions of all NHibernate dependencies
- Updated membership code to work with new v1.2-SNAPSHOT cartridges and NHibernate 1.2
- Set default solution wizard cartridge version to 1.2-SNAPSHOT
Revision Changes Path
1.4 +1 -1 plugins/etc/andromda-dotnet/AndroMDA.NHibernateSupport/AssemblyInfo.cs
Index: AssemblyInfo.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.NHibernateSupport/AssemblyInfo.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- AssemblyInfo.cs 28 Sep 2006 17:23:09 -0000 1.3
+++ AssemblyInfo.cs 1 Aug 2007 05:09:02 -0000 1.4
@@ -26,7 +26,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyVersion("1.0.7.0")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
No revision
No revision
No revision
No revision
No revision
|
|
From: Chris M. <cm...@us...> - 2007-08-01 05:07:33
|
User: cmicali
Date: 07/07/31 22:07:36
Modified: andromda-nspring/src/test/expected cartridge-output.zip
Removed: andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/Domain
DaoFactory.cs
andromda-nspring/src/test/expected/org/andromda/cartridges/nspring
IServiceOne.cs IServiceTwoNoStubs.cs
ITestEntity1Dao.cs ServiceOne.cs ServiceOne.g.cs
ServiceOneException.cs ServiceOneTests.cs
ServiceOneTestsImpl.cs ServiceTwoNoStubs.cs
ServiceTwoNoStubs.g.cs
ServiceTwoNoStubsException.cs
ServiceTwoNoStubsTests.cs
ServiceTwoNoStubsTestsImpl.cs TestEntity1Dao.cs
TestEntity1Dao.g.cs
Log:
- Removed override keyword from method declarations
- Removed abstract methods in base class
- Updated DaoBase NHibernate .Find() calls to .CreateQuery()
Revision Changes Path
1.8 +29 -28 cartridges/andromda-nspring/src/test/expected/cartridge-output.zip
<<Binary file>>
|
|
From: Chris M. <cm...@us...> - 2007-08-01 05:07:03
|
User: cmicali
Date: 07/07/31 22:07:06
Modified: andromda-nspring/src/main/resources/templates/nspring
NSpringDaoFactory.vsl NSpringHibernateDaoBase.vsl
NSpringServiceBase.vsl NSpringServiceImpl.vsl
Log:
- Removed override keyword from method declarations
- Removed abstract methods in base class
- Updated DaoBase NHibernate .Find() calls to .CreateQuery()
Revision Changes Path
1.5 +1 -1 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringDaoFactory.vsl
Index: NSpringDaoFactory.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringDaoFactory.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- NSpringDaoFactory.vsl 18 Oct 2006 12:44:45 -0000 1.4
+++ NSpringDaoFactory.vsl 1 Aug 2007 05:07:04 -0000 1.5
@@ -27,7 +27,7 @@
public static ${entity.packageName}.I${entity.entityName}Dao Get${entity.entityName}Dao()
{
if (_${entity.entityName}Dao == null)
- _${entity.entityName}Dao = new ${entity.packageName}.${entity.entityName}DaoImpl();
+ _${entity.entityName}Dao = new ${entity.packageName}.${entity.entityName}Dao();
return _${entity.entityName}Dao;
}
1.8 +6 -6 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoBase.vsl
Index: NSpringHibernateDaoBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoBase.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- NSpringHibernateDaoBase.vsl 1 Aug 2007 04:14:16 -0000 1.7
+++ NSpringHibernateDaoBase.vsl 1 Aug 2007 05:07:05 -0000 1.8
@@ -51,10 +51,10 @@
: NHibernateDaoSupport, $entity.fullyQualifiedDaoName
#end
{
-#foreach ($valueObjectRef in $entity.valueObjectReferences)
- public abstract $valueObjectRef.targetElement.fullyQualifiedName ${valueObjectRef.transformationMethodName}($entity.fullyQualifiedEntityName entity);
- public abstract $entity.fullyQualifiedEntityName ${valueObjectRef.transformationToEntityMethodName}($valueObjectRef.targetElement.fullyQualifiedName $stringUtils.uncapitalize($valueObjectRef.name));
-#end
+##foreach ($valueObjectRef in $entity.valueObjectReferences)
+## public abstract $valueObjectRef.targetElement.fullyQualifiedName ${valueObjectRef.transformationMethodName}($entity.fullyQualifiedEntityName entity);
+## public abstract $entity.fullyQualifiedEntityName ${valueObjectRef.transformationToEntityMethodName}($valueObjectRef.targetElement.fullyQualifiedName $stringUtils.uncapitalize($valueObjectRef.name));
+##end
#foreach($entityRef in $entity.entityReferences)
#set ($daoPropertyName = "$stringUtils.capitalize($entityRef.name)Dao")
@@ -108,7 +108,7 @@
/// </summary>
public $inheritanceModifierAllEntityMethod System.Collections.IList LoadAll(int transform)
{
- System.Collections.IList entities = Session.Find("from ${entity.fullyQualifiedEntityImplementationName}");
+ System.Collections.IList entities = Session.CreateQuery("from ${entity.fullyQualifiedEntityImplementationName}").List();
System.Collections.IList results = this.TransformEntities(transform, entities);
return results;
}
1.5 +0 -5 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceBase.vsl
Index: NSpringServiceBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceBase.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- NSpringServiceBase.vsl 1 Aug 2007 04:14:17 -0000 1.4
+++ NSpringServiceBase.vsl 1 Aug 2007 05:07:05 -0000 1.5
@@ -114,11 +114,6 @@
}
#end
- /// <summary>
- /// Performs the core logic for {@link #${operation.getSignature(false)}}
- /// <summary>
- protected abstract $operation.returnType.fullyQualifiedName $operation.implementationSignature;
-
#end
// NSpringServiceBase.vsl merge-point
1.5 +1 -3 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceImpl.vsl
Index: NSpringServiceImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceImpl.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- NSpringServiceImpl.vsl 1 Aug 2007 04:14:17 -0000 1.4
+++ NSpringServiceImpl.vsl 1 Aug 2007 05:07:05 -0000 1.5
@@ -17,8 +17,6 @@
/// </summary>
public#if($service.abstract) abstract#end partial class $service.implementationName
{
- private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof($service.implementationName));
-
#foreach ($operation in $service.operations)
/// <summary>
/// @see ${service.fullyQualifiedName}#${operation.getSignature(false)}
@@ -29,7 +27,7 @@
#else
#set ($termination = "")
#end
- protected#if ($abstract) abstract#else override#end $operation.returnType.fullyQualifiedName $operation.implementationSignature$termination
+ protected#if ($abstract) abstract#end $operation.returnType.fullyQualifiedName $operation.implementationSignature$termination
#if (!$abstract)
{
// put your implementation here
|
|
From: Chris M. <cm...@us...> - 2007-08-01 04:14:23
|
User: cmicali
Date: 07/07/31 21:14:25
Modified: andromda-nspring/src/test/expected cartridge-output.zip
andromda-nspring/src/test/expected/org/andromda/cartridges/nspring
ServiceOneTests.cs ServiceTwoNoStubsTests.cs
Added: andromda-nspring/src/test/expected/org/andromda/cartridges/nspring
ServiceOne.cs ServiceOne.g.cs ServiceTwoNoStubs.cs
ServiceTwoNoStubs.g.cs TestEntity1Dao.cs
TestEntity1Dao.g.cs
Removed: andromda-nspring/src/test/expected/org/andromda/cartridges/nspring
ServiceOneBase.cs ServiceOneImpl.cs
ServiceTwoNoStubsBase.cs ServiceTwoNoStubsImpl.cs
TestEntity1DaoBase.cs TestEntity1DaoImpl.cs
Log:
- Updated cart versions to 1.2-SNAPSHOT
- Changed base/impl scheme to partial classes
- Updated NH cartridge to NHibernate v1.2
Revision Changes Path
1.7 +54 -64 cartridges/andromda-nspring/src/test/expected/cartridge-output.zip
<<Binary file>>
1.3 +1 -1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOneTests.cs
Index: ServiceOneTests.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOneTests.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ServiceOneTests.cs 10 Jan 2007 07:20:28 -0000 1.2
+++ ServiceOneTests.cs 1 Aug 2007 04:14:23 -0000 1.3
@@ -31,7 +31,7 @@
{
if (null == _ServiceOne)
{
- _ServiceOne = new org.andromda.cartridges.nspring.ServiceOneImpl();
+ _ServiceOne = new org.andromda.cartridges.nspring.ServiceOne();
}
return _ServiceOne;
}
1.3 +1 -1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubsTests.cs
Index: ServiceTwoNoStubsTests.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubsTests.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ServiceTwoNoStubsTests.cs 10 Jan 2007 07:20:29 -0000 1.2
+++ ServiceTwoNoStubsTests.cs 1 Aug 2007 04:14:23 -0000 1.3
@@ -31,7 +31,7 @@
{
if (null == _ServiceTwoNoStubs)
{
- _ServiceTwoNoStubs = new org.andromda.cartridges.nspring.ServiceTwoNoStubsImpl();
+ _ServiceTwoNoStubs = new org.andromda.cartridges.nspring.ServiceTwoNoStubs();
}
return _ServiceTwoNoStubs;
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOne.cs
Index: ServiceOne.cs
===================================================================
// Name: ServiceOne.cs
// license-header cs merge-point
//
// This is only generated once! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
using AndroMDA.NHibernateSupport;
namespace org.andromda.cartridges.nspring
{
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceOne
/// </summary>
public partial class ServiceOne
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(ServiceOne));
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceOne#doSomething()
/// </summary>
protected override datatype::void HandleDoSomething()
{
// put your implementation here
throw new Exception("org::andromda::cartridges::nspring::ServiceOne.HandleDoSomething() is not implemented.");
}
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceOne#doSomethingElse(datatype::String)
/// </summary>
protected override datatype::long HandleDoSomethingElse(datatype::String param)
{
// put your implementation here
return null;
}
// NSpringServiceImpl.vsl merge-point
}
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceOne.g.cs
Index: ServiceOne.g.cs
===================================================================
// Name: ServiceOne.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringServiceBase.vsl in andromda-nspring-cartridge.
using System;
using AndroMDA.NHibernateSupport;
namespace org.andromda.cartridges.nspring
{
/// <summary>
/// <p>
/// Spring Service base class for <code>org::andromda::cartridges::nspring::ServiceOne</code>,
/// provides access to all services and entities referenced by this service.
/// </p>
///
/// @see org::andromda::cartridges::nspring::ServiceOne
/// </summary>
public partial class ServiceOne
: org.andromda.cartridges.nspring.IServiceOne
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(ServiceOne));
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceOne#doSomething()
/// </summary>
public datatype::void doSomething()
{
SessionManagerFactory.SessionManager.HandleSessionStart();
SessionManagerFactory.SessionManager.BeginTransaction();
try
{
HandleDoSomething();
SessionManagerFactory.SessionManager.CommitTransaction();
}
catch (Exception ex)
{
SessionManagerFactory.SessionManager.RollbackTransaction();
log.Error(ex);
throw ServiceOneException.Create(ex);
}
finally
{
SessionManagerFactory.SessionManager.HandleSessionEnd();
}
}
/// <summary>
/// Performs the core logic for {@link #doSomething()}
/// <summary>
protected abstract datatype::void HandleDoSomething();
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceOne#doSomethingElse(datatype::String)
/// </summary>
public datatype::long doSomethingElse(datatype::String param)
{
datatype::long result = null;
SessionManagerFactory.SessionManager.HandleSessionStart();
SessionManagerFactory.SessionManager.BeginTransaction();
try
{
result = HandleDoSomethingElse(param);
SessionManagerFactory.SessionManager.CommitTransaction();
}
catch (Exception ex)
{
SessionManagerFactory.SessionManager.RollbackTransaction();
log.Error(ex);
throw ServiceOneException.Create(ex);
}
finally
{
SessionManagerFactory.SessionManager.HandleSessionEnd();
}
return result;
}
/// <summary>
/// Performs the core logic for {@link #doSomethingElse(datatype::String)}
/// <summary>
protected abstract datatype::long HandleDoSomethingElse(datatype::String param);
// NSpringServiceBase.vsl merge-point
}
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubs.cs
Index: ServiceTwoNoStubs.cs
===================================================================
// Name: ServiceTwoNoStubs.cs
// license-header cs merge-point
//
// This is only generated once! It will never be overwritten.
// You can (and have to!) safely modify it by hand.
using System;
using AndroMDA.NHibernateSupport;
namespace org.andromda.cartridges.nspring
{
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceTwoNoStubs
/// </summary>
public partial class ServiceTwoNoStubs
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(ServiceTwoNoStubs));
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceTwoNoStubs#doSomething()
/// </summary>
protected override datatype::void HandleDoSomething()
{
// put your implementation here
throw new Exception("org::andromda::cartridges::nspring::ServiceTwoNoStubs.HandleDoSomething() is not implemented.");
}
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceTwoNoStubs#doSomethingElse(datatype::String)
/// </summary>
protected override datatype::long HandleDoSomethingElse(datatype::String param)
{
// put your implementation here
return null;
}
// NSpringServiceImpl.vsl merge-point
}
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/ServiceTwoNoStubs.g.cs
Index: ServiceTwoNoStubs.g.cs
===================================================================
// Name: ServiceTwoNoStubs.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringServiceBase.vsl in andromda-nspring-cartridge.
using System;
using AndroMDA.NHibernateSupport;
namespace org.andromda.cartridges.nspring
{
/// <summary>
/// <p>
/// Spring Service base class for <code>org::andromda::cartridges::nspring::ServiceTwoNoStubs</code>,
/// provides access to all services and entities referenced by this service.
/// </p>
///
/// @see org::andromda::cartridges::nspring::ServiceTwoNoStubs
/// </summary>
public partial class ServiceTwoNoStubs
: org.andromda.cartridges.nspring.IServiceTwoNoStubs
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(ServiceTwoNoStubs));
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceTwoNoStubs#doSomething()
/// </summary>
public datatype::void doSomething()
{
HandleDoSomething();
}
/// <summary>
/// Performs the core logic for {@link #doSomething()}
/// <summary>
protected abstract datatype::void HandleDoSomething();
/// <summary>
/// @see org::andromda::cartridges::nspring::ServiceTwoNoStubs#doSomethingElse(datatype::String)
/// </summary>
public datatype::long doSomethingElse(datatype::String param)
{
return HandleDoSomethingElse(param);
}
/// <summary>
/// Performs the core logic for {@link #doSomethingElse(datatype::String)}
/// <summary>
protected abstract datatype::long HandleDoSomethingElse(datatype::String param);
// NSpringServiceBase.vsl merge-point
}
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/TestEntity1Dao.cs
Index: TestEntity1Dao.cs
===================================================================
// Name: TestEntity1Dao.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringHibernateDaoImpl.vsl in andromda-nspring-cartridge.
using System;
namespace org.andromda.cartridges.nspring
{
/// <summary>
/// <see cref="org::andromda::cartridges::nspring::TestEntity1"/>
/// </summary>
public partial class TestEntity1Dao
{
// NSpringHibernateDaoImpl.vsl merge-point
}
}
1.1 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring/TestEntity1Dao.g.cs
Index: TestEntity1Dao.g.cs
===================================================================
// Name: TestEntity1Dao.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: NSpringHibernateDaoBase.vsl in andromda-nspring-cartridge.
using System;
using NHibernate;
using AndroMDA.NHibernateSupport;
namespace org.andromda.cartridges.nspring
{
/// <summary>
/// <p>
/// Base Spring DAO Class: is able to create, update, remove, load, and find
/// objects of type <code>org.andromda.cartridges.nspring.TestEntity1</code>.
/// </p>
///
/// <see cref="org.andromda.cartridges.nspring.TestEntity1"/>
/// </summary>
public partial class TestEntity1Dao
: NHibernateDaoSupport, org.andromda.cartridges.nspring.ITestEntity1Dao
{
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Load(int, datatype::Long)"/>
/// </summary>
public virtual Object Load(int transform, datatype::Long id)
{
if (id == null)
{
throw new ArgumentNullException(
"TestEntity1.Load - 'id' can not be null");
}
Object entity = Session.Load(typeof(org.andromda.cartridges.nspring.TestEntity1), id);
return TransformEntity(transform, (org::andromda::cartridges::nspring::TestEntity1)entity);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Load(datatype::Long)"/>
/// </summary>
public virtual org.andromda.cartridges.nspring.TestEntity1 Load(datatype::Long id)
{
return (org.andromda.cartridges.nspring.TestEntity1)this.Load((int)TransformTestEntity1.TRANSFORM_NONE, id);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.LoadAll()"/>
/// </summary>
public virtual System.Collections.IList LoadAll()
{
return this.LoadAll((int)TransformTestEntity1.TRANSFORM_NONE);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.LoadAll(int)" />
/// </summary>
public virtual System.Collections.IList LoadAll(int transform)
{
System.Collections.IList entities = Session.Find("from org.andromda.cartridges.nspring.TestEntity1");
System.Collections.IList results = this.TransformEntities(transform, entities);
return results;
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Create(org.andromda.cartridges.nspring.TestEntity1)"/>
/// </summary>
public virtual org.andromda.cartridges.nspring.TestEntity1 Create(org.andromda.cartridges.nspring.TestEntity1 testEntity1)
{
return (org.andromda.cartridges.nspring.TestEntity1)this.Create((int)TransformTestEntity1.TRANSFORM_NONE, testEntity1);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Create(int transform, org.andromda.cartridges.nspring.TestEntity1)"/>
/// </summary>
public virtual Object Create(int transform, org::andromda::cartridges::nspring::TestEntity1 testEntity1)
{
if (testEntity1 == null)
{
throw new ArgumentNullException(
"TestEntity1.Create - 'testEntity1' can not be null");
}
Session.Save(testEntity1);
return this.TransformEntity(transform, testEntity1);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Create(System.Collections.ICollection)"/>
/// </summary>
public virtual System.Collections.ICollection Create(System.Collections.ICollection entities)
{
return Create((int)TransformTestEntity1.TRANSFORM_NONE, entities);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Create(int, System.Collections.ICollection)"/>
/// </summary>
public virtual System.Collections.ICollection Create(int transform, System.Collections.ICollection entities)
{
if (entities == null)
{
throw new ArgumentNullException(
"TestEntity1.Create - 'entities' can not be null");
}
System.Collections.ArrayList result = new System.Collections.ArrayList();
foreach (Object entity in entities)
{
result.Add(Create(transform, (org.andromda.cartridges.nspring.TestEntity1)entity));
}
return result;
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Create(datatype::String)"/>
/// </summary>
public virtual org.andromda.cartridges.nspring.TestEntity1 Create(
datatype::String firstName)
{
return (org.andromda.cartridges.nspring.TestEntity1)this.Create((int)TransformTestEntity1.TRANSFORM_NONE, firstName);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Create(int, datatype::String)"/>
/// </summary>
public virtual Object Create(
int transform,
datatype::String firstName)
{
org.andromda.cartridges.nspring.TestEntity1 entity = new org.andromda.cartridges.nspring.TestEntity1();
entity.FirstName = firstName;
return this.Create(transform, entity);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Update(org.andromda.cartridges.nspring.TestEntity1)"/>
/// </summary>
public virtual void Update(org.andromda.cartridges.nspring.TestEntity1 testEntity1)
{
if (testEntity1 == null)
{
throw new ArgumentNullException(
"TestEntity1.Update - 'testEntity1' can not be null");
}
Session.Update(testEntity1);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Update(System.Collections.ICollection)"/>
/// </summary>
public virtual void Update(System.Collections.ICollection entities)
{
if (entities == null)
{
throw new ArgumentNullException(
"TestEntity1.Update - 'entities' can not be null");
}
foreach (Object entity in entities)
{
Session.Update((org.andromda.cartridges.nspring.TestEntity1)entity);
}
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Remove(org.andromda.cartridges.nspring.TestEntity1)"/>
/// </summary>
public virtual void Remove(org.andromda.cartridges.nspring.TestEntity1 testEntity1)
{
if (testEntity1 == null)
{
throw new ArgumentNullException(
"TestEntity1.Remove - 'testEntity1' can not be null");
}
Session.Delete(testEntity1);
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Remove(datatype::Long)"/>
/// </summary>
public virtual void Remove(datatype::Long id)
{
if (id == null)
{
throw new ArgumentNullException(
"TestEntity1.Remove - 'id' can not be null");
}
org.andromda.cartridges.nspring.TestEntity1 entity = this.Load(id);
if (entity != null)
{
this.Remove(entity);
}
}
/// <summary>
/// <see cref="org.andromda.cartridges.nspring.ITestEntity1Dao.Remove(System.Collections.ICollection)"/>
/// </summary>
public virtual void Remove(System.Collections.ICollection entities)
{
if (entities == null)
{
throw new ArgumentNullException(
"TestEntity1.Remove - 'entities' can not be null");
}
foreach (TestEntity1 entity in entities)
this.Remove(entity);
}
/// <summary>
/// Allows transformation of entities into value objects
/// (or something else for that matter), when the <code>transform</code>
/// flag is set to one of the constants defined in <code>org.andromda.cartridges.nspring.ITestEntity1Dao</code>, please note
/// that the <seealso cref="#TransformTestEntity1.TRANSFORM_NONE"/> constant denotes no transformation, so the entity itself
/// will be returned.
///
/// If the integer argument value is unknown <seealso cref="TRANSFORM_NONE"/> is assumed.
/// </summary>
/// <param name="transform">one of the constants declared in <seealso cref="org.andromda.cartridges.nspring.ITestEntity1Dao"/></param>
/// <param name="entity">an entity that was found</param>
/// <returns>the transformed entity (i.e. new value object, etc) <see cref="#TransformEntities(int,System.Collections.ICollection)"/></returns>
protected Object TransformEntity(int transform, org::andromda::cartridges::nspring::TestEntity1 entity)
{
Object target = null;
if (entity != null)
{
switch (transform)
{
case (int)TransformTestEntity1.TRANSFORM_NONE : // fall-through
default:
target = entity;
break;
}
}
return target;
}
/// <summary>
/// Transforms a collection of entities using the
/// <seealso cref="#TransformEntity(int,org::andromda::cartridges::nspring::TestEntity1)"/> method.
/// <p/>
/// This method is to be used internally only.
/// </summary>
/// <param name="transform">one of the constants declared in <code>org.andromda.cartridges.nspring.ITestEntity1Dao</code></param>
/// <param name="entities">the collection of entities to transform</param>
/// <returns>a new list containing the transformed entities <see cref="#TransformEntity(int,org::andromda::cartridges::nspring::TestEntity1)"/></returns>
protected virtual System.Collections.IList TransformEntities(int transform, System.Collections.ICollection entities)
{
System.Collections.IList entityList = null;
switch (transform)
{
case (int)TransformTestEntity1.TRANSFORM_NONE : // fall-through
default:
// Convert collection to list if necesary
entityList = entities as System.Collections.IList;
if (entityList == null)
entityList = new System.Collections.ArrayList(entities);
break;
}
return entityList;
}
// NSpringHibernateDaoBase.vsl merge-point
}
}
|
|
From: Chris M. <cm...@us...> - 2007-08-01 04:14:17
|
User: cmicali
Date: 07/07/31 21:14:18
Modified: andromda-nspring/src/main/resources/templates/nspring
NSpringHibernateDaoBase.vsl
NSpringHibernateDaoImpl.vsl NSpringServiceBase.vsl
NSpringServiceImpl.vsl
Log:
- Updated cart versions to 1.2-SNAPSHOT
- Changed base/impl scheme to partial classes
- Updated NH cartridge to NHibernate v1.2
Revision Changes Path
1.7 +2 -2 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoBase.vsl
Index: NSpringHibernateDaoBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoBase.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- NSpringHibernateDaoBase.vsl 18 Oct 2006 12:44:45 -0000 1.6
+++ NSpringHibernateDaoBase.vsl 1 Aug 2007 04:14:16 -0000 1.7
@@ -1,5 +1,5 @@
#parse("templates/nspring/NSpringGlobals.vm")
-#set ($generatedFile = "${entity.packagePath}/${entity.daoBaseName}.cs")
+#set ($generatedFile = "${entity.packagePath}/${entity.daoBaseName}.g.cs")
// Name: ${entity.daoBaseName}.cs
// license-header cs merge-point
//
@@ -44,7 +44,7 @@
///
/// <see cref="$entity.fullyQualifiedEntityName"/>
/// </summary>
- public abstract class $entity.daoBaseName
+ public partial class $entity.daoBaseName
#if($superEntity)
: $superEntity.fullyQualifiedDaoImplementationName, $entity.fullyQualifiedDaoName
#else
1.5 +1 -1 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoImpl.vsl
Index: NSpringHibernateDaoImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoImpl.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- NSpringHibernateDaoImpl.vsl 18 Oct 2006 12:44:46 -0000 1.4
+++ NSpringHibernateDaoImpl.vsl 1 Aug 2007 04:14:16 -0000 1.5
@@ -20,7 +20,7 @@
/// <summary>
/// <see cref="$entity.fullyQualifiedName"/>
/// </summary>
- public class $entity.daoImplementationName : $entity.fullyQualifiedDaoBaseName
+ public partial class $entity.daoImplementationName
{
#foreach ($operation in $entity.daoBusinessOperations)
#set ($returnType = $operation.returnType)
1.4 +2 -2 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceBase.vsl
Index: NSpringServiceBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceBase.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NSpringServiceBase.vsl 18 Oct 2006 12:44:46 -0000 1.3
+++ NSpringServiceBase.vsl 1 Aug 2007 04:14:17 -0000 1.4
@@ -1,4 +1,4 @@
-#set ($generatedFile = "${service.packagePath}/${service.baseName}.cs")
+#set ($generatedFile = "${service.packagePath}/${service.baseName}.g.cs")
// Name: ${service.baseName}.cs
// license-header cs merge-point
//
@@ -20,7 +20,7 @@
///
/// @see $service.fullyQualifiedName
/// </summary>
- public abstract class $service.baseName
+ public partial class $service.baseName
#if($service.generalization)
: $service.generalization.fullyQualifiedImplementationName
#else
1.4 +1 -2 cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceImpl.vsl
Index: NSpringServiceImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceImpl.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NSpringServiceImpl.vsl 18 Oct 2006 12:44:46 -0000 1.3
+++ NSpringServiceImpl.vsl 1 Aug 2007 04:14:17 -0000 1.4
@@ -15,8 +15,7 @@
/// <summary>
/// @see $service.fullyQualifiedName
/// </summary>
- public#if($service.abstract) abstract#end class $service.implementationName
- : $service.fullyQualifiedBaseName
+ public#if($service.abstract) abstract#end partial class $service.implementationName
{
private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof($service.implementationName));
|
|
From: Chris M. <cm...@us...> - 2007-08-01 04:14:09
|
User: cmicali
Date: 07/07/31 21:14:12
Modified: andromda-nspring/src/main/resources/META-INF/andromda
namespace.xml
Log:
- Updated cart versions to 1.2-SNAPSHOT
- Changed base/impl scheme to partial classes
- Updated NH cartridge to NHibernate v1.2
Revision Changes Path
1.5 +6 -6 cartridges/andromda-nspring/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- namespace.xml 9 Jan 2007 10:53:18 -0000 1.4
+++ namespace.xml 1 Aug 2007 04:14:11 -0000 1.5
@@ -148,23 +148,23 @@
</documentation>
</property>
<property name="daoBaseNamePattern">
- <default>{0}DaoBase</default>
+ <default>{0}Dao</default>
<documentation>
The pattern to use when constructing the base DAO's name.
<em>{0}</em> is used to represent the entity name
in the model, so if you specified a value of
- <code>{0}DaoBase</code> all the entities generated
- would have a suffix of "DaoBase".
+ <code>{0}Dao</code> all the entities generated
+ would have a suffix of "Dao".
</documentation>
</property>
<property name="daoImplementationNamePattern">
- <default>{0}DaoImpl</default>
+ <default>{0}Dao</default>
<documentation>
The pattern to use when constructing the DAO's
implementation name. <em>{0}</em> is used to represent
the entity name in the model, so if you specified a value of
- <code>{0}DaoImpl</code> all the entities generated
- would have a suffix of "DaoImpl".
+ <code>{0}Dao</code> all the entities generated
+ would have a suffix of "Dao".
</documentation>
</property>
<property name="ejbJndiNamePrefix" required="false">
|
|
From: Chris M. <cm...@us...> - 2007-08-01 04:14:04
|
User: cmicali
Date: 07/07/31 21:14:06
Modified: andromda-nspring/src/main/java/org/andromda/cartridges/nspring/metafacades
SpringGlobals.java
Log:
- Updated cart versions to 1.2-SNAPSHOT
- Changed base/impl scheme to partial classes
- Updated NH cartridge to NHibernate v1.2
Revision Changes Path
1.3 +2 -2 cartridges/andromda-nspring/src/main/java/org/andromda/cartridges/nspring/metafacades/SpringGlobals.java
Index: SpringGlobals.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/java/org/andromda/cartridges/nspring/metafacades/SpringGlobals.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- SpringGlobals.java 15 Jun 2006 14:59:55 -0000 1.2
+++ SpringGlobals.java 1 Aug 2007 04:14:06 -0000 1.3
@@ -10,7 +10,7 @@
/**
* POJO implementation class suffix.
*/
- final static String IMPLEMENTATION_SUFFIX = "Impl";
+ final static String IMPLEMENTATION_SUFFIX = "";
/**
* EJB implementation class suffix.
@@ -25,7 +25,7 @@
/**
* The service base class suffix.
*/
- final static String SERVICE_BASE_SUFFIX = "Base";
+ final static String SERVICE_BASE_SUFFIX = "";
/**
* The bean name target suffix
|
|
From: Chris M. <cm...@us...> - 2007-08-01 04:13:58
|
User: cmicali Date: 07/07/31 21:14:01 Modified: andromda-nhibernate/src/test/expected cartridge-output.zip Log: - Updated cart versions to 1.2-SNAPSHOT - Changed base/impl scheme to partial classes - Updated NH cartridge to NHibernate v1.2 Revision Changes Path 1.9 +21 -28 cartridges/andromda-nhibernate/src/test/expected/cartridge-output.zip <<Binary file>> |
|
From: Chris M. <cm...@us...> - 2007-08-01 04:13:52
|
User: cmicali
Date: 07/07/31 21:13:55
Modified: andromda-nhibernate/src/main/uml
HibernateMetafacadeModel.xml.zip
Log:
- Updated cart versions to 1.2-SNAPSHOT
- Changed base/impl scheme to partial classes
- Updated NH cartridge to NHibernate v1.2
Revision Changes Path
1.4 +1169 -88 cartridges/andromda-nhibernate/src/main/uml/HibernateMetafacadeModel.xml.zip
<<Binary file>>
|
|
From: Chris M. <cm...@us...> - 2007-08-01 04:13:28
|
User: cmicali
Date: 07/07/31 21:13:30
Modified: andromda-nhibernate/src/main/resources/templates/nhibernate
NHibernateEmbeddedValue.vsl
NHibernateEmbeddedValueImpl.vsl
NHibernateEntity.vsl NHibernateEntityImpl.vsl
NHibernateEntityImplManual.vsl
NHibernateEnumeration.vsl nhibernate.cfg.xml.vsl
nhibernate.hbm.xml.vm nhibernate.hbm.xml.vsl
Log:
- Updated cart versions to 1.2-SNAPSHOT
- Changed base/impl scheme to partial classes
- Updated NH cartridge to NHibernate v1.2
Revision Changes Path
1.6 +5 -5 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValue.vsl
Index: NHibernateEmbeddedValue.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValue.vsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- NHibernateEmbeddedValue.vsl 18 Oct 2006 12:37:31 -0000 1.5
+++ NHibernateEmbeddedValue.vsl 1 Aug 2007 04:13:28 -0000 1.6
@@ -1,5 +1,5 @@
-#set ($generatedFile = "${embeddedValue.packagePath}/${embeddedValue.name}.cs")
-// Name: ${embeddedValue.name}.cs
+#set ($generatedFile = "${embeddedValue.packagePath}/${embeddedValue.name}.g.cs")
+// Name: ${embeddedValue.name}.g.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
@@ -15,7 +15,7 @@
$embeddedValue.getDocumentation(" /// ")
/// </summary>
[Serializable]
- public abstract class $embeddedValue.name
+ public partial class $embeddedValue.name
#if($embeddedValue.generalization)
: $embeddedValue.generalization.fullyQualifiedName
#end
@@ -41,7 +41,7 @@
#end
{
- $embeddedValue.implementationName obj = new ${embeddedValue.implementationName}();
+ $embeddedValue.name obj = new ${embeddedValue.name}();
#foreach ($attribute in $embeddedValue.attributes)
obj._${attribute.name} = ${attribute.name};
#end
1.4 +4 -6 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValueImpl.vsl
Index: NHibernateEmbeddedValueImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValueImpl.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NHibernateEmbeddedValueImpl.vsl 15 Jun 2006 15:01:08 -0000 1.3
+++ NHibernateEmbeddedValueImpl.vsl 1 Aug 2007 04:13:28 -0000 1.4
@@ -1,5 +1,5 @@
-#set ($generatedFile = "${embeddedValue.packagePath}/${embeddedValue.implementationName}.cs")
-// Name: ${embeddedValue.implementationName}.cs
+#set ($generatedFile = "${embeddedValue.packagePath}/${embeddedValue.name}.cs")
+// Name: ${embeddedValue.name}.cs
// license-header cs merge-point
//
// This is only generated once! It will never be overwritten.
@@ -14,9 +14,7 @@
/// <summary>
/// <see cref="$embeddedValue.fullyQualifiedName"/>
/// </summary>
- [Serializable]
- public#if ($embeddedValue.abstract) abstract#end class $embeddedValue.implementationName
- : $embeddedValue.fullyQualifiedName
+ public#if ($embeddedValue.abstract) abstract#end partial class $embeddedValue.name
{
#foreach ($operation in $embeddedValue.operations)
/// <summary>
1.8 +9 -9 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl
Index: NHibernateEntity.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- NHibernateEntity.vsl 18 Oct 2006 12:37:31 -0000 1.7
+++ NHibernateEntity.vsl 1 Aug 2007 04:13:28 -0000 1.8
@@ -1,5 +1,5 @@
-#set ($generatedFile = "${entity.packagePath}/${entity.entityName}.cs")
-// Name: ${entity.entityName}.cs
+#set ($generatedFile = "${entity.packagePath}/${entity.entityName}.g.cs")
+// Name: ${entity.entityName}.g.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
@@ -15,9 +15,9 @@
$entity.getDocumentation(" /// ")
/// </summary>
[Serializable]
- public abstract class $entity.entityName
+ public partial class $entity.entityName
#if($entity.generalization)
- : $entity.generalization.fullyQualifiedEntityImplementationName
+ : $entity.generalization.fullyQualifiedEntityName
#end
{
@@ -121,7 +121,7 @@
#if ($identifiers.empty)
/// This entity does not have any identifiers
#if ($entity.generalization)
- /// but since it extends the <code>$entity.generalization.fullyQualifiedEntityImplementationName</code> class
+ /// but since it extends the <code>$entity.generalization.fullyQualifiedEntityName</code> class
/// it will simply delegate the call up there.
///
/// <see cref="$entity.generalization.fullyQualifiedEntityName#Equals(Object)"/>
@@ -149,7 +149,7 @@
#if ($identifiers.empty)
/// This entity does not have any identifiers
#if ($entity.generalization)
- /// but since it extends the <code>$entity.generalization.fullyQualifiedEntityImplementationName</code> class
+ /// but since it extends the <code>$entity.generalization.fullyQualifiedEntityName</code> class
/// it will simply delegate the call up there.
///
/// <see cref="$entity.generalization.fullyQualifiedEntityName#GetHashCode()"/>
@@ -202,7 +202,7 @@
/// </summary>
public static $entity.fullyQualifiedName NewInstance()
{
- return new ${entity.fullyQualifiedEntityImplementationName}();
+ return new ${entity.fullyQualifiedEntityName}();
}
}
@@ -225,7 +225,7 @@
/// </summary>
public static $entity.fullyQualifiedName NewInstance()
{
- return new ${entity.fullyQualifiedEntityImplementationName}();
+ return new ${entity.fullyQualifiedEntityName}();
}
}
#endregion
1.4 +4 -6 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImpl.vsl
Index: NHibernateEntityImpl.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImpl.vsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- NHibernateEntityImpl.vsl 18 Oct 2006 12:37:31 -0000 1.3
+++ NHibernateEntityImpl.vsl 1 Aug 2007 04:13:28 -0000 1.4
@@ -1,5 +1,5 @@
-#set ($generatedFile = "${entity.packagePath}/${entity.entityImplementationName}.cs")
-// Name: ${entity.entityImplementationName}.cs
+#set ($generatedFile = "${entity.packagePath}/${entity.entityName}.cs")
+// Name: ${entity.entityName}.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
@@ -14,9 +14,7 @@
/// <summary>
/// <see cref="$entity.fullyQualifiedEntityName"/>
/// </summary>
- [Serializable]
- public#if ($entity.abstract) abstract#end class $entity.entityImplementationName
- : $entity.fullyQualifiedEntityName
+ public#if ($entity.abstract) abstract#end partial class $entity.entityName
{
// NHibernateEntityImpl.vsl merge-point
}
1.3 +4 -6 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImplManual.vsl
Index: NHibernateEntityImplManual.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImplManual.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NHibernateEntityImplManual.vsl 9 Apr 2006 14:32:40 -0000 1.2
+++ NHibernateEntityImplManual.vsl 1 Aug 2007 04:13:29 -0000 1.3
@@ -1,5 +1,5 @@
-#set ($generatedFile = "${entity.packagePath}/${entity.entityImplementationName}.cs")
-// Name: ${entity.entityImplementationName}.cs
+#set ($generatedFile = "${entity.packagePath}/${entity.entityName}.cs")
+// Name: ${entity.entityName}.cs
// license-header cs merge-point
//
// This is only generated once! It will never be overwritten.
@@ -14,9 +14,7 @@
/// <summary>
/// <see cref="$entity.fullyQualifiedEntityName"/>
/// </summary>
- [Serializable]
- public#if ($entity.abstract) abstract#end class $entity.entityImplementationName
- : $entity.fullyQualifiedEntityName
+ public#if ($entity.abstract) abstract#end partial class $entity.entityName
{
#foreach ($operation in $entity.businessOperations)
/// <summary>
1.3 +1 -1 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEnumeration.vsl
Index: NHibernateEnumeration.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEnumeration.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
1.2 +1 -1 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/nhibernate.cfg.xml.vsl
Index: nhibernate.cfg.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/nhibernate.cfg.xml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- nhibernate.cfg.xml.vsl 8 Mar 2006 04:15:24 -0000 1.1
+++ nhibernate.cfg.xml.vsl 1 Aug 2007 04:13:29 -0000 1.2
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="$xmlEncoding"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Attention: Generated code! Do not modify by hand!
Generated by: hibernate.cfg.xml.vsl in andromda-nhibernate-cartridge.
1.3 +9 -9 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/nhibernate.hbm.xml.vm
Index: nhibernate.hbm.xml.vm
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/nhibernate.hbm.xml.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- nhibernate.hbm.xml.vm 18 Oct 2006 12:30:44 -0000 1.2
+++ nhibernate.hbm.xml.vm 1 Aug 2007 04:13:29 -0000 1.3
@@ -11,7 +11,7 @@
#set ($fullyQualifiedPropertyType = "$attribute.type.fullyQualifiedHibernateType, ${commonAssemblyName}")
#end
#if ($attribute.containsEmbeddedObject)
- <component name="$stringUtils.upperCamelCaseName($attribute.name)" class="${attribute.type.packageName}.${attribute.type.implementationName}, ${coreAssemblyName}">
+ <component name="$stringUtils.upperCamelCaseName($attribute.name)" class="${attribute.type.packageName}.${attribute.type.name}, ${coreAssemblyName}">
## render the properties of the embedded type
#set ($sqlPrefix = $attribute.columnName)
#renderPropertiesAndAssociations($attribute.type $sqlPrefix)
@@ -34,17 +34,17 @@
#if ($sourceEnd.one2One)
#if ($sourceEnd.one2OnePrimary || (!$sourceEnd.navigable && !$entity.foreignHibernateGeneratorClass))
#if ($otherEnd.type.foreignHibernateGeneratorClass)
- <one-to-one name="$stringUtils.upperCamelCaseName($otherEnd.name)" class="$otherEnd.type.fullyQualifiedEntityImplementationName, ${coreAssemblyName}" outer-join="$otherEnd.outerJoin"#if ($otherEnd.hibernateCascade) cascade="$otherEnd.hibernateCascade"#end/>
+ <one-to-one name="$stringUtils.upperCamelCaseName($otherEnd.name)" class="$otherEnd.type.fullyQualifiedEntityName, ${coreAssemblyName}" outer-join="$otherEnd.outerJoin"#if ($otherEnd.hibernateCascade) cascade="$otherEnd.hibernateCascade"#end/>
#else
- <many-to-one name="$stringUtils.upperCamelCaseName($otherEnd.name)" class="$otherEnd.type.fullyQualifiedEntityImplementationName, ${coreAssemblyName}" foreign-key="$otherEnd.foreignKeyConstraintName" outer-join="$otherEnd.outerJoin"#if ($otherEnd.hibernateCascade) cascade="$otherEnd.hibernateCascade"#end#if($otherEnd.columnIndex) index="$otherEnd.columnIndex"#end>
+ <many-to-one name="$stringUtils.upperCamelCaseName($otherEnd.name)" class="$otherEnd.type.fullyQualifiedEntityName, ${coreAssemblyName}" foreign-key="$otherEnd.foreignKeyConstraintName" outer-join="$otherEnd.outerJoin"#if ($otherEnd.hibernateCascade) cascade="$otherEnd.hibernateCascade"#end#if($otherEnd.columnIndex) index="$otherEnd.columnIndex"#end>
<column name="$otherEnd.columnName" not-null="$otherEnd.required" sql-type="$otherEnd.sqlType" unique="true"/>
</many-to-one>
#end
#else
#if ($entity.foreignHibernateGeneratorClass)
- <one-to-one name="$stringUtils.upperCamelCaseName($otherEnd.name)" class="$otherEnd.type.fullyQualifiedEntityImplementationName, ${coreAssemblyName}" foreign-key="$otherEnd.foreignKeyConstraintName" outer-join="$otherEnd.outerJoin"#if ($otherEnd.hibernateCascade) cascade="$otherEnd.hibernateCascade"#end constrained="true"/>
+ <one-to-one name="$stringUtils.upperCamelCaseName($otherEnd.name)" class="$otherEnd.type.fullyQualifiedEntityName, ${coreAssemblyName}" foreign-key="$otherEnd.foreignKeyConstraintName" outer-join="$otherEnd.outerJoin"#if ($otherEnd.hibernateCascade) cascade="$otherEnd.hibernateCascade"#end constrained="true"/>
#else
- <one-to-one name="$stringUtils.upperCamelCaseName($otherEnd.name)" class="$otherEnd.type.fullyQualifiedEntityImplementationName, ${coreAssemblyName}" outer-join="$otherEnd.outerJoin" property-ref="$stringUtils.upperCamelCaseName($sourceEnd.name)"#if ($otherEnd.hibernateCascade) cascade="$otherEnd.hibernateCascade"#end/>
+ <one-to-one name="$stringUtils.upperCamelCaseName($otherEnd.name)" class="$otherEnd.type.fullyQualifiedEntityName, ${coreAssemblyName}" outer-join="$otherEnd.outerJoin" property-ref="$stringUtils.upperCamelCaseName($sourceEnd.name)"#if ($otherEnd.hibernateCascade) cascade="$otherEnd.hibernateCascade"#end/>
#end
#end
#end
@@ -65,10 +65,10 @@
#if ($otherEnd.indexedCollection)
<index column="$otherEnd.collectionIndexName"#if($otherEnd.map) type="$otherEnd.collectionIndexType"#end/>
#end
- <one-to-many class="$otherEnd.type.fullyQualifiedEntityImplementationName, ${coreAssemblyName}"/>
+ <one-to-many class="$otherEnd.type.fullyQualifiedEntityName, ${coreAssemblyName}"/>
</$otherEnd.collectionType>
#elseif ($sourceEnd.many2One)
- <many-to-one name="$stringUtils.upperCamelCaseName($otherEnd.name)" class="$otherEnd.type.fullyQualifiedEntityImplementationName, ${coreAssemblyName}" outer-join="$otherEnd.outerJoin"#if ($otherEnd.hibernateCascade) cascade="$otherEnd.hibernateCascade"#end foreign-key="$otherEnd.foreignKeyConstraintName"#if($otherEnd.columnIndex) index="$otherEnd.columnIndex"#end>
+ <many-to-one name="$stringUtils.upperCamelCaseName($otherEnd.name)" class="$otherEnd.type.fullyQualifiedEntityName, ${coreAssemblyName}" outer-join="$otherEnd.outerJoin"#if ($otherEnd.hibernateCascade) cascade="$otherEnd.hibernateCascade"#end foreign-key="$otherEnd.foreignKeyConstraintName"#if($otherEnd.columnIndex) index="$otherEnd.columnIndex"#end>
<column name="$otherEnd.columnName" not-null="$otherEnd.required" sql-type="$otherEnd.sqlType"/>
</many-to-one>
#elseif ($sourceEnd.many2Many)
@@ -76,7 +76,7 @@
<key foreign-key="$sourceEnd.foreignKeyConstraintName">
<column name="$sourceEnd.columnName" sql-type="$sourceEnd.sqlType"/>
</key>
- <many-to-many class="$otherEnd.type.fullyQualifiedEntityImplementationName, ${coreAssemblyName}" foreign-key="$otherEnd.foreignKeyConstraintName">
+ <many-to-many class="$otherEnd.type.fullyQualifiedEntityName, ${coreAssemblyName}" foreign-key="$otherEnd.foreignKeyConstraintName">
<column name="$otherEnd.columnName" sql-type="$otherEnd.sqlType"#if($otherEnd.columnIndex) index="$otherEnd.columnIndex"#end/>
</many-to-many>
</$otherEnd.collectionType>
@@ -90,7 +90,7 @@
##
#macro (renderSubClass $entity)
## Should only get get invoked for inheritance class or subclass.
- <$entity.mappingClassName name="$entity.fullyQualifiedEntityImplementationName, ${coreAssemblyName}"#if($entity.tableRequired) table="$entity.tableName"#else discriminator-value="$entity.entityImplementationName"#end lazy="$entity.lazy"#if($entity.hibernateProxy) proxy="$entity.fullyQualifiedEntityImplementationName"#end dynamic-insert="$entity.dynamicInsert" dynamic-update="$entity.dynamicUpdate">
+ <$entity.mappingClassName name="$entity.fullyQualifiedEntityName, ${coreAssemblyName}"#if($entity.tableRequired) table="$entity.tableName"#else discriminator-value="$entity.entityName"#end lazy="$entity.lazy"#if($entity.hibernateProxy) proxy="$entity.fullyQualifiedEntityName"#end dynamic-insert="$entity.dynamicInsert" dynamic-update="$entity.dynamicUpdate">
#if($entity.subclassKeyColumn)
<key foreign-key="${entity.tableName}_INHERITANCE_FKC">
<column name="$entity.subclassKeyColumn" sql-type="$identifier.sqlType"/>
1.5 +4 -4 cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/nhibernate.hbm.xml.vsl
Index: nhibernate.hbm.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/nhibernate.hbm.xml.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- nhibernate.hbm.xml.vsl 10 Jan 2007 20:18:51 -0000 1.4
+++ nhibernate.hbm.xml.vsl 1 Aug 2007 04:13:29 -0000 1.5
@@ -9,17 +9,17 @@
Generated by: nhibernate.hbm.xml.vsl in andromda-nhibernate-cartridge.
-->
<hibernate-mapping
- xmlns="urn:nhibernate-mapping-2.0"
+ xmlns="urn:nhibernate-mapping-2.2"
default-cascade="$entity.hibernateDefaultCascade">
<class
- name="$entity.fullyQualifiedEntityImplementationName, ${coreAssemblyName}"
+ name="$entity.fullyQualifiedEntityName, ${coreAssemblyName}"
table="$entity.tableName"
dynamic-insert="$entity.dynamicInsert"
dynamic-update="$entity.dynamicUpdate"
#if ($stringUtils.isNotBlank($entity.schema)) schema="$entity.schema"
#end
- lazy="$entity.lazy"#if ($entity.hibernateProxy) proxy="$entity.fullyQualifiedEntityImplementationName"#end>
+ lazy="$entity.lazy"#if ($entity.hibernateProxy) proxy="$entity.fullyQualifiedEntityName"#end>
#if($hibernateEnableCache.equalsIgnoreCase("true"))
<cache usage="$entity.hibernateCacheType" />
|
|
From: Chris M. <cm...@us...> - 2007-08-01 04:13:22
|
User: cmicali
Date: 07/07/31 21:13:23
Modified: andromda-cs pom.xml
andromda-nhibernate pom.xml
andromda-nspring pom.xml
Log:
- Updated cart versions to 1.2-SNAPSHOT
- Changed base/impl scheme to partial classes
- Updated NH cartridge to NHibernate v1.2
Revision Changes Path
1.13 +1 -1 cartridges/andromda-cs/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/pom.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- pom.xml 12 Jun 2007 16:23:32 -0000 1.12
+++ pom.xml 1 Aug 2007 04:13:23 -0000 1.13
@@ -10,7 +10,7 @@
<artifactId>andromda-cs-cartridge</artifactId>
<packaging>andromda-cartridge</packaging>
<name>AndroMDA C# Cartridge</name>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
<description>Produces C# objects from a model.</description>
<issueManagement>
<system>jira</system>
1.13 +1 -1 cartridges/andromda-nhibernate/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/pom.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- pom.xml 12 Jun 2007 16:23:07 -0000 1.12
+++ pom.xml 1 Aug 2007 04:13:23 -0000 1.13
@@ -10,7 +10,7 @@
<artifactId>andromda-nhibernate-cartridge</artifactId>
<packaging>andromda-cartridge</packaging>
<name>AndroMDA NHibernate Cartridge</name>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
<description>
Produces NHibernate entities optionally services implemented as Session EJB facades.
</description>
1.10 +1 -1 cartridges/andromda-nspring/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/pom.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- pom.xml 12 Jun 2007 16:23:33 -0000 1.9
+++ pom.xml 1 Aug 2007 04:13:23 -0000 1.10
@@ -10,7 +10,7 @@
<artifactId>andromda-nspring-cartridge</artifactId>
<packaging>andromda-cartridge</packaging>
<name>AndroMDA NSpring Cartridge</name>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
<description>
Generates NSpring with NHibernate support
</description>
|
|
From: Chad B. <cwb...@us...> - 2007-07-24 18:18:10
|
User: cwbrandon
Date: 07/07/24 11:18:11
Modified: andromda-jsf2/src/main/resources/META-INF/andromda
cartridge.xml
Added: andromda-jsf2/src/main/resources/resources/lib/trinidad
trinidad-impl-1.0.2-SNAPSHOT.jar
trinidad-api-1.0.2-SNAPSHOT.jar
Log:
include trinidad libs for 1.0.2 (until they release), that can optionally be generated by specifying the "libraries" outlet
Revision Changes Path
1.9 +1 -1 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- cartridge.xml 19 Jul 2007 17:27:00 -0000 1.8
+++ cartridge.xml 24 Jul 2007 18:18:09 -0000 1.9
@@ -144,7 +144,7 @@
lastModifiedCheck="true"/>
<resource
- path="resources/lib/*.jar"
+ path="resources/lib/trinidad/*.jar"
outputPattern="WEB-INF/lib/{0}"
outlet="libraries"
overwrite="true"
1.1 cartridges/andromda-jsf2/src/main/resources/resources/lib/trinidad/trinidad-impl-1.0.2-SNAPSHOT.jar
<<Binary file>>
1.1 cartridges/andromda-jsf2/src/main/resources/resources/lib/trinidad/trinidad-api-1.0.2-SNAPSHOT.jar
<<Binary file>>
|
|
From: Chad B. <cwb...@us...> - 2007-07-24 18:17:02
|
User: cwbrandon Date: 07/07/24 11:17:03 cartridges/andromda-jsf2/src/main/resources/resources/lib/trinidad - New directory |
|
From: Vance K. <va...@us...> - 2007-07-21 13:31:51
|
User: vancek
Date: 07/07/21 06:31:53
Modified: andromda-ejb3/src/site changes.xml
andromda-ejb3/src/test/expected cartridge-output.zip
andromda-ejb3/src/test/uml EJB3CartridgeTestModel.xml.zip
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
ejb-65 - fix for abstract parent entities and supporting associations
Revision Changes Path
1.25 +10 -1 cartridges/andromda-ejb3/src/site/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- changes.xml 30 Jun 2007 03:53:47 -0000 1.24
+++ changes.xml 21 Jul 2007 13:31:51 -0000 1.25
@@ -505,6 +505,15 @@
relationNameSeparator in the andromda.xml within the ejb3 namespace with a value of underscore (_) if you
wish to adopt this separator. The default separator will remain the AndroMDA default digit two.
</action>
+ <action dev="walter" type="add">
+ JIRA EJB-58 - Add readById method to crud services such that cartridge can be used with JSF2 cartridge
+ and crud/manageable features.
+ </action>
+ <action dev="vancek" due-to="hermida" type="fix">
+ JIRA EJB-65 - Modify the cartridge to support abstract parent entities. EJB2.x did not support this, but
+ this is now supported with EJb 3.0. An abstract parent entity can have a relationship with any other
+ entity and this should be available to the child inheriting entities. Add test cases to support this.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.15 +515 -499 cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
<<Binary file>>
1.10 +298 -248 cartridges/andromda-ejb3/src/test/uml/EJB3CartridgeTestModel.xml.zip
<<Binary file>>
1.30 +1 -29 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -r1.29 -r1.30
--- EJB3EntityFacadeLogicImpl.java 17 Feb 2007 14:09:07 -0000 1.29
+++ EJB3EntityFacadeLogicImpl.java 21 Jul 2007 13:31:53 -0000 1.30
@@ -289,24 +289,7 @@
*/
protected java.util.Collection handleGetAllEntityRelations()
{
- // Only concrete entities may have EJB relations. Return
- // an empty collection for everything else
- if (this.isAbstract())
- {
- return Collections.EMPTY_LIST;
- }
-
- Collection result = new ArrayList();
- result.addAll(getEntityRelations());
-
- ClassifierFacade classifier = (ClassifierFacade)this.getGeneralization();
- while (classifier != null && classifier instanceof EJB3EntityFacade && classifier.isAbstract())
- {
- EJB3EntityFacade entity = (EJB3EntityFacade)classifier;
- result.addAll(entity.getEntityRelations());
- classifier = (ClassifierFacade)classifier.getGeneralization();
- }
- return result;
+ return this.getEntityRelations();
}
/**
@@ -413,17 +396,6 @@
ClassifierFacade target = associationEnd.getOtherEnd().getType();
if (target instanceof EJB3EntityFacade && associationEnd.getOtherEnd().isNavigable())
{
- // Check the integrity constraint
- Object value = associationEnd.getOtherEnd().getAssociation().findTaggedValue(
- EJB3Profile.TAGGEDVALUE_GENERATE_CMR);
- String generateCmr = value == null ? null : value.toString();
- if (target.isAbstract() && !"false".equalsIgnoreCase(generateCmr))
- {
- throw new IllegalStateException("Relation '" + associationEnd.getAssociation().getName() +
- "' has the abstract target '" +
- target.getName() +
- "'. Abstract targets are not allowed in EJB.");
- }
result.add(associationEnd);
}
}
|
