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...> - 2006-08-16 21:55:31
|
User: cmicali Date: 06/08/16 14:55:30 plugins/samples/time-tracker-dotnet/mda/src - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-16 21:55:16
|
User: cmicali Date: 06/08/16 14:55:14 plugins/samples/time-tracker-dotnet/Lib - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-16 21:55:15
|
User: cmicali Date: 06/08/16 14:55:15 plugins/samples/time-tracker-dotnet/Northwind.TimeTracker.Web.Common - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-16 21:55:15
|
User: cmicali Date: 06/08/16 14:55:15 plugins/samples/time-tracker-dotnet/Northwind.TimeTracker.Core - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-16 21:55:15
|
User: cmicali Date: 06/08/16 14:55:15 plugins/samples/time-tracker-dotnet/Northwind.TimeTracker.Web - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-16 21:55:15
|
User: cmicali Date: 06/08/16 14:55:15 plugins/samples/time-tracker-dotnet/Northwind.TimeTracker.SchemaExport - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-16 21:55:07
|
User: cmicali Date: 06/08/16 14:55:07 plugins/samples/time-tracker-dotnet - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-16 21:55:00
|
User: cmicali Date: 06/08/16 14:54:58 plugins/samples - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-16 21:40:25
|
User: cmicali
Date: 06/08/16 14:40:23
Modified: andromda-nhibernate pom.xml
Log:
- Removed version 1.0 tag to build as part of 1.0-SNAPSHOT
Revision Changes Path
1.4 +0 -1 cartridges/andromda-nhibernate/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/pom.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- pom.xml 15 Aug 2006 22:48:46 -0000 1.3
+++ pom.xml 16 Aug 2006 21:40:23 -0000 1.4
@@ -9,7 +9,6 @@
</parent>
<artifactId>andromda-nhibernate-cartridge</artifactId>
<packaging>andromda-cartridge</packaging>
- <version>1.0</version>
<name>AndroMDA NHibernate Cartridge</name>
<description>
Produces NHibernate entities optionally services implemented as Session EJB facades.
|
|
From: Chris M. <cm...@us...> - 2006-08-15 22:48:50
|
User: cmicali
Date: 06/08/15 15:48:50
Modified: andromda-cs/conf/test andromda.xml
andromda-cs pom.xml
andromda-cs/src/main/resources/META-INF/andromda
cartridge.xml namespace.xml profile.xml
andromda-cs/src/main/resources/templates/cs Enumeration.vsl
Interface.vsl ValueObject.vsl
andromda-cs/src/test/expected cartridge-output.zip
andromda-cs/src/test/expected/org/andromda/cartridges/csharp
OrderedValueObject.cs RelatedValueObject.cs
SelfReferencingValueObject.cs TemplateTestVO.cs
TestEnumeration.cs TestValueObject.cs
andromda-cs/src/test/uml CsCartridgeTestModel.xml.zip
andromda-nhibernate pom.xml
andromda-nhibernate/src/main/resources/templates/nhibernate
NHibernateEmbeddedValue.vsl NHibernateEntity.vsl
nhibernate.hbm.xml.vsl
andromda-nhibernate/src/test/expected cartridge-output.zip
andromda-nhibernate/src/test/uml
HibernateCartridgeTestModel.xml.zip
andromda-nspring/conf/test andromda.xml
andromda-nspring pom.xml
andromda-nspring/src/main/resources/templates/nspring
NSpringDaoFactory.vsl NSpringHibernateDaoBase.vsl
NSpringServiceImpl.vsl
andromda-nspring/src/test/expected cartridge-output.zip
Added: andromda-cs/src/test/expected/org/andromda/cartridges/csharp
TestStringEnumeration.cs TestSubInterface1.cs
TestSubInterface2.cs TestSubInterface3.cs
TestSuperInterface1.cs TestSuperInterface2.cs
andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate
EntityOne.cs EntityOne.hbm.xml EntityOneImpl.cs
EntityTwo.cs EntityTwo.hbm.xml EntityTwoImpl.cs
andromda-nspring/src/test/expected/org/andromda/cartridges/nspring
IServiceOne.cs IServiceTwoNoStubs.cs
ServiceOneBase.cs ServiceOneImpl.cs
ServiceTwoNoStubsBase.cs ServiceTwoNoStubsImpl.cs
andromda-nspring/src/test/uml
NSpringCartridgeTestModel.xml.zip
Removed: andromda-cs/src/main/resources/templates/cs Service.vsl
ServiceImpl.vsl
andromda-nspring/src/test/uml
SpringCartridgeTestModel.xml.zip
Log:
- Removed old java tests, created new simple tests, and enabled tests on NSpring and NHibernate cartriges
- Updated all .net templates to use regions, fix whitespace, and use _ before attribute names
- Modified and enabled the interface template on the CS cartridge
- Fixed entity->entity dependencies in the NHibernate cartridge
Revision Changes Path
1.3 +0 -2 cartridges/andromda-cs/conf/test/andromda.xml
Index: andromda.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/conf/test/andromda.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- andromda.xml 22 Jun 2006 20:42:08 -0000 1.2
+++ andromda.xml 15 Aug 2006 22:48:42 -0000 1.3
@@ -31,8 +31,6 @@
<property name="overwrite">true</property>
<property name="languageMappingsUri">Cs</property>
<property name="wrapperMappingsUri">CsWrapper</property>
- <property name="services">${test.output.dir}</property>
- <property name="service-impls">${test.output.dir}</property>
<property name="value-objects">${test.output.dir}</property>
<property name="exceptions">${test.output.dir}</property>
<property name="enumerations">${test.output.dir}</property>
1.6 +8 -0 cartridges/andromda-cs/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/pom.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- pom.xml 28 Jul 2006 02:45:44 -0000 1.5
+++ pom.xml 15 Aug 2006 22:48:43 -0000 1.6
@@ -20,6 +20,14 @@
<role>Developer</role>
</roles>
</developer>
+ <developer>
+ <name>Chris Micali</name>
+ <id>chris</id>
+ <email>ch...@an...</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
</developers>
<build>
<plugins>
1.2 +2 -30 cartridges/andromda-cs/src/main/resources/META-INF/andromda/cartridge.xml
Index: cartridge.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/META-INF/andromda/cartridge.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- cartridge.xml 8 Mar 2006 04:10:53 -0000 1.1
+++ cartridge.xml 15 Aug 2006 22:48:43 -0000 1.2
@@ -9,34 +9,6 @@
<!-- cartridge-resource merge-point -->
-<!--
- <template
- path="templates/cs/Service.vsl"
- outputPattern="{0}/{1}.cs"
- outlet="services"
- overwrite="true">
- <modelElements variable="service">
- <modelElement>
- <type name="org.andromda.metafacades.uml.Service"/>
- </modelElement>
- </modelElements>
- </template>
--->
-
-<!--
- <template
- path="templates/cs/ServiceImpl.vsl"
- outputPattern="{0}/{1}Impl.cs"
- outlet="service-impls"
- overwrite="false">
- <modelElements variable="service">
- <modelElement>
- <type name="org.andromda.metafacades.uml.Service"/>
- </modelElement>
- </modelElements>
- </template>
--->
-
<template
path="templates/cs/ValueObject.vsl"
outputPattern="{0}/{1}.cs"
@@ -86,7 +58,7 @@
</modelElements>
</template>
-<!--
+
<template
path="templates/cs/Interface.vsl"
outputPattern="{0}/{1}.cs"
@@ -100,7 +72,7 @@
</modelElement>
</modelElements>
</template>
--->
+
<!-- cartridge-template merge-point -->
1.3 +0 -10 cartridges/andromda-cs/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- namespace.xml 28 Jul 2006 02:58:30 -0000 1.2
+++ namespace.xml 15 Aug 2006 22:48:43 -0000 1.3
@@ -12,16 +12,6 @@
<documentation>
Defines the locations to which output is generated.
</documentation>
- <property name="services" required="false">
- <documentation>
- The directory to which service interfaces are generated.
- </documentation>
- </property>
- <property name="service-impls" required="false">
- <documentation>
- The directory to which service implementation classes are generated
- </documentation>
- </property>
<property name="value-objects" required="false">
<documentation>
The directory to which value objects are generated.
1.3 +0 -8 cartridges/andromda-cs/src/main/resources/META-INF/andromda/profile.xml
Index: profile.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/META-INF/andromda/profile.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- profile.xml 28 Jul 2006 02:58:50 -0000 1.2
+++ profile.xml 15 Aug 2006 22:48:43 -0000 1.3
@@ -3,14 +3,6 @@
<profile>
<elements>
<elementGroup name="Stereotypes">
- <element name="SERVICE">
- <documentation>
- Produces C# service classes. This includes both a service interface as well as a
- service implemention.
- </documentation>
- <value>Service</value>
- <appliedOnElement>class</appliedOnElement>
- </element>
<element name="VALUE_OBJECT">
<documentation>
Produces Cs value objects.
1.5 +2 -1 cartridges/andromda-cs/src/main/resources/templates/cs/Enumeration.vsl
Index: Enumeration.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/Enumeration.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- Enumeration.vsl 28 Jul 2006 02:39:56 -0000 1.4
+++ Enumeration.vsl 15 Aug 2006 22:48:43 -0000 1.5
@@ -17,6 +17,7 @@
$enumeration.getDocumentation(" /// ")
/// </summary>
public enum $enumeration.name#if ($stringUtils.isNotBlank($enumType)) :$enumType#end
+
{
#foreach ($literal in $enumeration.literals)
#if ($literal.defaultValue)
1.3 +23 -45 cartridges/andromda-cs/src/main/resources/templates/cs/Interface.vsl
Index: Interface.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/Interface.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- Interface.vsl 28 Jul 2006 02:09:21 -0000 1.2
+++ Interface.vsl 15 Aug 2006 22:48:43 -0000 1.3
@@ -20,45 +20,23 @@
#end
{
+ // ----- Accessors -----
#foreach($attribute in $interface.attributes)
#if ($attribute.visibility == "public")
-#if ($attribute.static)
/// <summary>
$attribute.getDocumentation(" /// ")
/// </summary>
- /* C# does not support fields in an interface */
- /*public static $attribute.type.fullyQualifiedName $attribute.name = $attribute.defaultValue;*/
-#else
- /// <summary>
-$attribute.getDocumentation(" /// ")
- /// </summary>
- $attribute.getterSetterTypeName ${attribute.getterName}();
-
- /// <summary>
-$attribute.getDocumentation(" /// ")
- /// </summary>
- void ${attribute.setterName}($attribute.getterSetterTypeName $attribute.name);
-#end
-
-#end
+ $attribute.getterSetterTypeName ${stringUtils.upperCamelCaseName($attribute.name)}
+ {
+ get;
+#if (!$attribute.static)
+ set;
#end
-#foreach ($associationEnd in $interface.associationEnds)
-#set ($target = $associationEnd.otherEnd)
-#if ($target.navigable)
- /// <summary>
- /// Get the $target.name
-$target.getDocumentation(" /// ")
- /// </summary>
- $target.getterSetterTypeName ${target.getterName}();
-
- /// <summary>
- /// Set the $target.name
- /// </summary>
- void ${target.setterName}($target.getterSetterTypeName $target.name);
+ }
#end
#end
-
+ // ----- Operations -----
#foreach ( $operation in $interface.operations)
#if ($operation.visibility == "public")
/// <summary>
1.3 +25 -14 cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl
Index: ValueObject.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/ValueObject.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ValueObject.vsl 28 Jul 2006 02:10:07 -0000 1.2
+++ ValueObject.vsl 15 Aug 2006 22:48:43 -0000 1.3
@@ -19,20 +19,25 @@
: ${class.generalization.fullyQualifiedName}
#end
{
- // ----- Attributes and Associations -----
+
+ #region Attributes and Associations
+
## **** Generate attribute ****
#foreach ($attribute in $class.attributes)
- private $attribute.getterSetterTypeName $attribute.name;
+ private $attribute.getterSetterTypeName _$attribute.name;
#end
## **** Generate associations ****
#foreach ($associationEnd in $class.associationEnds)
#set ($target = $associationEnd.otherEnd)
#if ($target.navigable)
- private $target.getterSetterTypeName $target.name;
+ private $target.getterSetterTypeName _$target.name;
#end
#end
- // ----- Constructors -----
+ #endregion
+
+ #region Constructors
+
#if (!$class.properties.empty)
public ${class.name}()
{
@@ -57,7 +62,7 @@
#end
{
#foreach ($property in $class.properties)
- this.${property.name} = ${property.name};
+ this._${property.name} = ${property.name};
#end
}
@@ -66,17 +71,20 @@
/// <summary>
/// Copy constructor
/// </summary>
- public ${class.name}(${class.name} otherBean)
+ public ${class.name}(${class.name} other${class.name})
{
- if (otherBean != null)
+ if (other${class.name} != null)
{
#foreach ( $property in $class.properties)
- this.${property.name} = otherBean.${property.name};
+ this._${property.name} = other${class.name}.${stringUtils.upperCamelCaseName($property.name)};
#end
}
}
- // ----- Accessors -----
+ #endregion
+
+ #region Properties
+
## **** Generate accessors for attributes ****
#foreach ($attribute in $class.attributes)
/// <summary>
@@ -84,8 +92,8 @@
/// </summary>
$attribute.visibility $attribute.getterSetterTypeName ${stringUtils.upperCamelCaseName($attribute.name)}
{
- get { return $attribute.name; }
- set { this.$attribute.name = value; }
+ get { return _$attribute.name; }
+ set { this._$attribute.name = value; }
}
#end
@@ -98,13 +106,16 @@
/// </summary>
public $target.getterSetterTypeName ${stringUtils.upperCamelCaseName($target.name)}
{
- get { return $target.name; }
- set { this.$target.name = value; }
+ get { return _$target.name; }
+ set { this._$target.name = value; }
}
#end
#end
+ #endregion
+
// ValueObject.vsl merge-point
+
}
#if ($stringUtils.isNotBlank($class.packageName))
}
1.4 +34 -19 cartridges/andromda-cs/src/test/expected/cartridge-output.zip
<<Binary file>>
1.2 +22 -11 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/OrderedValueObject.cs
Index: OrderedValueObject.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/OrderedValueObject.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- OrderedValueObject.cs 22 Jun 2006 20:28:27 -0000 1.1
+++ OrderedValueObject.cs 15 Aug 2006 22:48:44 -0000 1.2
@@ -18,10 +18,15 @@
[Serializable]
public class OrderedValueObject
{
- // ----- Attributes and Associations -----
- private org.andromda.cartridges.csharp.TestValueObject testValueObject;
- // ----- Constructors -----
+ #region Attributes and Associations
+
+ private org.andromda.cartridges.csharp.TestValueObject _testValueObject;
+
+ #endregion
+
+ #region Constructors
+
public OrderedValueObject()
{
}
@@ -33,30 +38,36 @@
org.andromda.cartridges.csharp.TestValueObject testValueObject)
{
- this.testValueObject = testValueObject;
+ this._testValueObject = testValueObject;
}
/// <summary>
/// Copy constructor
/// </summary>
- public OrderedValueObject(OrderedValueObject otherBean)
+ public OrderedValueObject(OrderedValueObject otherOrderedValueObject)
{
- if (otherBean != null)
+ if (otherOrderedValueObject != null)
{
- this.testValueObject = otherBean.testValueObject;
+ this._testValueObject = otherOrderedValueObject.TestValueObject;
}
}
- // ----- Accessors -----
+ #endregion
+
+ #region Properties
+
/// <summary>
///
/// </summary>
public org.andromda.cartridges.csharp.TestValueObject TestValueObject
{
- get { return testValueObject; }
- set { this.testValueObject = value; }
+ get { return _testValueObject; }
+ set { this._testValueObject = value; }
}
+ #endregion
+
// ValueObject.vsl merge-point
+
}
}
1.2 +32 -21 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/RelatedValueObject.cs
Index: RelatedValueObject.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/RelatedValueObject.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- RelatedValueObject.cs 22 Jun 2006 20:28:27 -0000 1.1
+++ RelatedValueObject.cs 15 Aug 2006 22:48:44 -0000 1.2
@@ -18,12 +18,17 @@
[Serializable]
public class RelatedValueObject
{
- // ----- Attributes and Associations -----
- private org.andromda.cartridges.csharp.TestSuperInterface1 oneAttribute;
- private org.andromda.cartridges.csharp.TestValueObject testValueObject;
- private org.andromda.cartridges.csharp.TestEnumeration testEnumeration;
- // ----- Constructors -----
+ #region Attributes and Associations
+
+ private org.andromda.cartridges.csharp.TestSuperInterface1 _oneAttribute;
+ private org.andromda.cartridges.csharp.TestValueObject _testValueObject;
+ private org.andromda.cartridges.csharp.TestEnumeration _testEnumeration;
+
+ #endregion
+
+ #region Constructors
+
public RelatedValueObject()
{
}
@@ -37,32 +42,35 @@
org.andromda.cartridges.csharp.TestEnumeration testEnumeration)
{
- this.oneAttribute = oneAttribute;
- this.testValueObject = testValueObject;
- this.testEnumeration = testEnumeration;
+ this._oneAttribute = oneAttribute;
+ this._testValueObject = testValueObject;
+ this._testEnumeration = testEnumeration;
}
/// <summary>
/// Copy constructor
/// </summary>
- public RelatedValueObject(RelatedValueObject otherBean)
+ public RelatedValueObject(RelatedValueObject otherRelatedValueObject)
{
- if (otherBean != null)
+ if (otherRelatedValueObject != null)
{
- this.oneAttribute = otherBean.oneAttribute;
- this.testValueObject = otherBean.testValueObject;
- this.testEnumeration = otherBean.testEnumeration;
+ this._oneAttribute = otherRelatedValueObject.OneAttribute;
+ this._testValueObject = otherRelatedValueObject.TestValueObject;
+ this._testEnumeration = otherRelatedValueObject.TestEnumeration;
}
}
- // ----- Accessors -----
+ #endregion
+
+ #region Properties
+
/// <summary>
///
/// </summary>
public org.andromda.cartridges.csharp.TestSuperInterface1 OneAttribute
{
- get { return oneAttribute; }
- set { this.oneAttribute = value; }
+ get { return _oneAttribute; }
+ set { this._oneAttribute = value; }
}
/// <summary>
@@ -70,8 +78,8 @@
/// </summary>
public org.andromda.cartridges.csharp.TestValueObject TestValueObject
{
- get { return testValueObject; }
- set { this.testValueObject = value; }
+ get { return _testValueObject; }
+ set { this._testValueObject = value; }
}
/// <summary>
@@ -79,10 +87,13 @@
/// </summary>
public org.andromda.cartridges.csharp.TestEnumeration TestEnumeration
{
- get { return testEnumeration; }
- set { this.testEnumeration = value; }
+ get { return _testEnumeration; }
+ set { this._testEnumeration = value; }
}
+ #endregion
+
// ValueObject.vsl merge-point
+
}
}
1.2 +21 -10 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/SelfReferencingValueObject.cs
Index: SelfReferencingValueObject.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/SelfReferencingValueObject.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- SelfReferencingValueObject.cs 22 Jun 2006 20:28:27 -0000 1.1
+++ SelfReferencingValueObject.cs 15 Aug 2006 22:48:44 -0000 1.2
@@ -18,10 +18,15 @@
[Serializable]
public class SelfReferencingValueObject
{
- // ----- Attributes and Associations -----
- private org.andromda.cartridges.csharp.SelfReferencingValueObject reference;
- // ----- Constructors -----
+ #region Attributes and Associations
+
+ private org.andromda.cartridges.csharp.SelfReferencingValueObject _reference;
+
+ #endregion
+
+ #region Constructors
+
public SelfReferencingValueObject()
{
}
@@ -29,24 +34,30 @@
/// <summary>
/// Copy constructor
/// </summary>
- public SelfReferencingValueObject(SelfReferencingValueObject otherBean)
+ public SelfReferencingValueObject(SelfReferencingValueObject otherSelfReferencingValueObject)
{
- if (otherBean != null)
+ if (otherSelfReferencingValueObject != null)
{
- this.reference = otherBean.reference;
+ this._reference = otherSelfReferencingValueObject.Reference;
}
}
- // ----- Accessors -----
+ #endregion
+
+ #region Properties
+
/// <summary>
///
/// </summary>
public org.andromda.cartridges.csharp.SelfReferencingValueObject Reference
{
- get { return reference; }
- set { this.reference = value; }
+ get { return _reference; }
+ set { this._reference = value; }
}
+ #endregion
+
// ValueObject.vsl merge-point
+
}
}
1.2 +27 -16 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TemplateTestVO.cs
Index: TemplateTestVO.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TemplateTestVO.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TemplateTestVO.cs 22 Jun 2006 20:28:27 -0000 1.1
+++ TemplateTestVO.cs 15 Aug 2006 22:48:44 -0000 1.2
@@ -18,11 +18,16 @@
[Serializable]
public class TemplateTestVO
{
- // ----- Attributes and Associations -----
- private int someAttribute;
- private org.andromda.cartridges.csharp.TemplateTestVO[] reference;
- // ----- Constructors -----
+ #region Attributes and Associations
+
+ private int _someAttribute;
+ private org.andromda.cartridges.csharp.TemplateTestVO[] _reference;
+
+ #endregion
+
+ #region Constructors
+
public TemplateTestVO()
{
}
@@ -35,30 +40,33 @@
org.andromda.cartridges.csharp.TemplateTestVO[] reference)
{
- this.someAttribute = someAttribute;
- this.reference = reference;
+ this._someAttribute = someAttribute;
+ this._reference = reference;
}
/// <summary>
/// Copy constructor
/// </summary>
- public TemplateTestVO(TemplateTestVO otherBean)
+ public TemplateTestVO(TemplateTestVO otherTemplateTestVO)
{
- if (otherBean != null)
+ if (otherTemplateTestVO != null)
{
- this.someAttribute = otherBean.someAttribute;
- this.reference = otherBean.reference;
+ this._someAttribute = otherTemplateTestVO.SomeAttribute;
+ this._reference = otherTemplateTestVO.Reference;
}
}
- // ----- Accessors -----
+ #endregion
+
+ #region Properties
+
/// <summary>
///
/// </summary>
public int SomeAttribute
{
- get { return someAttribute; }
- set { this.someAttribute = value; }
+ get { return _someAttribute; }
+ set { this._someAttribute = value; }
}
/// <summary>
@@ -66,10 +74,13 @@
/// </summary>
public org.andromda.cartridges.csharp.TemplateTestVO[] Reference
{
- get { return reference; }
- set { this.reference = value; }
+ get { return _reference; }
+ set { this._reference = value; }
}
+ #endregion
+
// ValueObject.vsl merge-point
+
}
}
1.2 +1 -1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestEnumeration.cs
Index: TestEnumeration.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestEnumeration.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestEnumeration.cs 22 Jun 2006 20:28:27 -0000 1.1
+++ TestEnumeration.cs 15 Aug 2006 22:48:44 -0000 1.2
@@ -15,7 +15,7 @@
/// <summary>
///
/// </summary>
- public enum :Long TestEnumeration
+ public enum TestEnumeration : long
{
TEST1 = 0,
TEST2 = 1203212
1.2 +37 -26 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestValueObject.cs
Index: TestValueObject.cs
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestValueObject.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- TestValueObject.cs 22 Jun 2006 20:28:27 -0000 1.1
+++ TestValueObject.cs 15 Aug 2006 22:48:44 -0000 1.2
@@ -20,13 +20,18 @@
[Serializable]
public class TestValueObject
{
- // ----- Attributes and Associations -----
- private System.Collections.ICollection attributeOne;
- private int? attributeTwo;
- private org.andromda.cartridges.csharp.RelatedValueObject[] relatedValueObjects;
- private org.andromda.cartridges.csharp.OrderedValueObject[] orderedValueObjects;
- // ----- Constructors -----
+ #region Attributes and Associations
+
+ private System.Collections.ICollection _attributeOne;
+ private int? _attributeTwo;
+ private org.andromda.cartridges.csharp.RelatedValueObject[] _relatedValueObjects;
+ private org.andromda.cartridges.csharp.OrderedValueObject[] _orderedValueObjects;
+
+ #endregion
+
+ #region Constructors
+
public TestValueObject()
{
}
@@ -41,34 +46,37 @@
org.andromda.cartridges.csharp.OrderedValueObject[] orderedValueObjects)
{
- this.attributeOne = attributeOne;
- this.attributeTwo = attributeTwo;
- this.relatedValueObjects = relatedValueObjects;
- this.orderedValueObjects = orderedValueObjects;
+ this._attributeOne = attributeOne;
+ this._attributeTwo = attributeTwo;
+ this._relatedValueObjects = relatedValueObjects;
+ this._orderedValueObjects = orderedValueObjects;
}
/// <summary>
/// Copy constructor
/// </summary>
- public TestValueObject(TestValueObject otherBean)
+ public TestValueObject(TestValueObject otherTestValueObject)
{
- if (otherBean != null)
+ if (otherTestValueObject != null)
{
- this.attributeOne = otherBean.attributeOne;
- this.attributeTwo = otherBean.attributeTwo;
- this.relatedValueObjects = otherBean.relatedValueObjects;
- this.orderedValueObjects = otherBean.orderedValueObjects;
+ this._attributeOne = otherTestValueObject.AttributeOne;
+ this._attributeTwo = otherTestValueObject.AttributeTwo;
+ this._relatedValueObjects = otherTestValueObject.RelatedValueObjects;
+ this._orderedValueObjects = otherTestValueObject.OrderedValueObjects;
}
}
- // ----- Accessors -----
+ #endregion
+
+ #region Properties
+
/// <summary>
///
/// </summary>
public System.Collections.ICollection AttributeOne
{
- get { return attributeOne; }
- set { this.attributeOne = value; }
+ get { return _attributeOne; }
+ set { this._attributeOne = value; }
}
/// <summary>
@@ -76,8 +84,8 @@
/// </summary>
public int? AttributeTwo
{
- get { return attributeTwo; }
- set { this.attributeTwo = value; }
+ get { return _attributeTwo; }
+ set { this._attributeTwo = value; }
}
/// <summary>
@@ -85,8 +93,8 @@
/// </summary>
public org.andromda.cartridges.csharp.RelatedValueObject[] RelatedValueObjects
{
- get { return relatedValueObjects; }
- set { this.relatedValueObjects = value; }
+ get { return _relatedValueObjects; }
+ set { this._relatedValueObjects = value; }
}
/// <summary>
@@ -94,10 +102,13 @@
/// </summary>
public org.andromda.cartridges.csharp.OrderedValueObject[] OrderedValueObjects
{
- get { return orderedValueObjects; }
- set { this.orderedValueObjects = value; }
+ get { return _orderedValueObjects; }
+ set { this._orderedValueObjects = value; }
}
+ #endregion
+
// ValueObject.vsl merge-point
+
}
}
1.1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestStringEnumeration.cs
Index: TestStringEnumeration.cs
===================================================================
// Name: TestStringEnumeration.cs
/**
* Example license header for Cs files
*
* http://www.andromda.org/
*/
//
// Attention: Generated code! Do not modify by hand!
// Generated by: Enumeration.vsl in andromda-cs-cartridge.
using System;
namespace org.andromda.cartridges.csharp
{
/// <summary>
///
/// </summary>
public enum TestStringEnumeration
{
Test1,
Test2
// Enumeration.vsl merge-point
}
}
1.1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface1.cs
Index: TestSubInterface1.cs
===================================================================
// Name: TestSubInterface1.cs
/**
* Example license header for Cs files
*
* http://www.andromda.org/
*/
//
// Attention: Generated code! Do not modify by hand!
// Generated by: Interface.vsl in andromda-cs-cartridge.
using System;
namespace org.andromda.cartridges.csharp
{
/// <summary>
///
/// </summary>
public interface TestSubInterface1
: org.andromda.cartridges.csharp.TestSuperInterface1, org.andromda.cartridges.csharp.TestSuperInterface2
{
// ----- Accessors -----
// ----- Operations -----
}
}
1.1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface2.cs
Index: TestSubInterface2.cs
===================================================================
// Name: TestSubInterface2.cs
/**
* Example license header for Cs files
*
* http://www.andromda.org/
*/
//
// Attention: Generated code! Do not modify by hand!
// Generated by: Interface.vsl in andromda-cs-cartridge.
using System;
namespace org.andromda.cartridges.csharp
{
/// <summary>
///
/// </summary>
public interface TestSubInterface2
: org.andromda.cartridges.csharp.TestSuperInterface1, org.andromda.cartridges.csharp.TestSuperInterface2
{
// ----- Accessors -----
// ----- Operations -----
}
}
1.1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSubInterface3.cs
Index: TestSubInterface3.cs
===================================================================
// Name: TestSubInterface3.cs
/**
* Example license header for Cs files
*
* http://www.andromda.org/
*/
//
// Attention: Generated code! Do not modify by hand!
// Generated by: Interface.vsl in andromda-cs-cartridge.
using System;
namespace org.andromda.cartridges.csharp
{
/// <summary>
///
/// </summary>
public interface TestSubInterface3
: org.andromda.cartridges.csharp.TestSuperInterface1
{
// ----- Accessors -----
// ----- Operations -----
/// <summary>
///
/// </summary>
org.andromda.cartridges.csharp.TestSuperInterface2 operation31(float xx);
}
}
1.1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSuperInterface1.cs
Index: TestSuperInterface1.cs
===================================================================
// Name: TestSuperInterface1.cs
/**
* Example license header for Cs files
*
* http://www.andromda.org/
*/
//
// Attention: Generated code! Do not modify by hand!
// Generated by: Interface.vsl in andromda-cs-cartridge.
using System;
namespace org.andromda.cartridges.csharp
{
/// <summary>
///
/// </summary>
public interface TestSuperInterface1
{
// ----- Accessors -----
/// <summary>
/// <p>
/// This is an arbitrarily simple constant.
/// </p>
/// </summary>
int MYCONSTANT1
{
get;
}
/// <summary>
/// <p>
/// This is an equally arbitrarily simple constant.
/// </p>
/// </summary>
int MYCONSTANT2
{
get;
}
/// <summary>
/// <p>
/// This attribute should be generated as a pair of getters/setters.
/// </p>
/// </summary>
String SomeInstanceAttribute
{
get;
set;
}
// ----- Operations -----
/// <summary>
///
/// </summary>
void operation1(int i);
}
}
1.1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestSuperInterface2.cs
Index: TestSuperInterface2.cs
===================================================================
// Name: TestSuperInterface2.cs
/**
* Example license header for Cs files
*
* http://www.andromda.org/
*/
//
// Attention: Generated code! Do not modify by hand!
// Generated by: Interface.vsl in andromda-cs-cartridge.
using System;
namespace org.andromda.cartridges.csharp
{
/// <summary>
///
/// </summary>
public interface TestSuperInterface2
{
// ----- Accessors -----
// ----- Operations -----
}
}
1.4 +69 -80 cartridges/andromda-cs/src/test/uml/CsCartridgeTestModel.xml.zip
<<Binary file>>
1.3 +10 -1 cartridges/andromda-nhibernate/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- pom.xml 14 Jun 2006 15:13:36 -0000 1.2
+++ pom.xml 15 Aug 2006 22:48:46 -0000 1.3
@@ -9,6 +9,7 @@
</parent>
<artifactId>andromda-nhibernate-cartridge</artifactId>
<packaging>andromda-cartridge</packaging>
+ <version>1.0</version>
<name>AndroMDA NHibernate Cartridge</name>
<description>
Produces NHibernate entities optionally services implemented as Session EJB facades.
@@ -27,6 +28,14 @@
</roles>
</developer>
<developer>
+ <name>Chris Micali</name>
+ <id>chris</id>
+ <email>ch...@an...</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
<name>Louis Coude</name>
<id>Louis</id>
<email>l_...@ho...</email>
@@ -110,7 +119,7 @@
</plugins>
</build>
<properties>
- <maven.test.skip>true</maven.test.skip>
+ <maven.test.skip>false</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.3 +7 -7 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NHibernateEmbeddedValue.vsl 15 Jun 2006 15:01:08 -0000 1.2
+++ NHibernateEmbeddedValue.vsl 15 Aug 2006 22:48:46 -0000 1.3
@@ -22,7 +22,7 @@
{
// ----- Attributes -----
#foreach ($attribute in $embeddedValue.attributes)
- private $attribute.getterSetterTypeName $attribute.name;
+ private $attribute.getterSetterTypeName _$attribute.name;
#end
// ----- Constructors -----
@@ -43,7 +43,7 @@
{
$embeddedValue.implementationName obj = new ${embeddedValue.implementationName}();
#foreach ($attribute in $embeddedValue.attributes)
- obj.${attribute.name} = ${attribute.name};
+ obj._${attribute.name} = ${attribute.name};
#end
obj.initialize();
return obj;
@@ -58,7 +58,7 @@
{
return newInstance(
#foreach ($attribute in $embeddedValue.attributes)
- otherObject.${attribute.name}#if($velocityCount != $embeddedValue.attributes.size()),#else);
+ otherObject._${attribute.name}#if($velocityCount != $embeddedValue.attributes.size()),#else);
#end
#end
@@ -89,17 +89,17 @@
#if ($embeddedValue.immutable)
public $typeName ${stringUtils.upperCamelCaseName($attribute.name)}
{
- get { return $attribute.name; }
+ get { return _$attribute.name; }
}
protected void ${attribute.setterName}($attribute.getterSetterTypeName $attribute.name)
{
- this.${attribute.name} = $attribute.name;
+ this._${attribute.name} = $attribute.name;
}
#else
public $typeName ${stringUtils.upperCamelCaseName($attribute.name)}
{
- get { return $attribute.name; }
- set { this.$attribute.name = value; }
+ get { return _$attribute.name; }
+ set { this._$attribute.name = value; }
}
#end
1.3 +30 -18 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NHibernateEntity.vsl 9 Apr 2006 14:32:40 -0000 1.2
+++ NHibernateEntity.vsl 15 Aug 2006 22:48:46 -0000 1.3
@@ -20,48 +20,52 @@
: $entity.generalization.fullyQualifiedEntityImplementationName
#end
{
+
#if ($stringUtils.isNotBlank($entity.hibernateVersionProperty))
#set ($versionProperty = $entity.hibernateVersionProperty)
#set ($versionPropertyCapitalized = $stringUtils.capitalize($entity.hibernateVersionProperty))
+ #region Hibernate version property
+
/// <summary>
/// Version property managed by Hibernate.
/// </summary>
- private int $versionProperty;
+ private int _$versionProperty;
- public int get$versionPropertyCapitalized()
+ public int ${stringUtils.upperCamelCaseName($versionProperty)}
{
- return this.$versionProperty;
+ get { return $versionProperty; }
+ set { this.$versionProperty= value; }
}
- private void set$versionPropertyCapitalized (int $versionProperty)
- {
- this.$versionProperty = $versionProperty;
- }
+ #endregion
#end
- #region Attributes and Associations -----
+ #region Attributes and Associations
+
## **** Generate attribute ****
#foreach ( $attribute in $entity.attributes )
#set ($typeName = $attribute.type.fullyQualifiedName)
#if ($attribute.containsEmbeddedObject)
#set ($typeName = $attribute.type.fullyQualifiedEntityName)
#end
- private $typeName $attribute.name;
+ private $typeName _$attribute.name;
#end
## **** Generate associations ****
#foreach ($associationEnd in $entity.associationEnds)
#set ($target = $associationEnd.otherEnd)
#if ($target.navigable || ($associationEnd.child && $entity.foreignHibernateGeneratorClass))
#if ($target.many)
- private $target.getterSetterTypeName $target.name = $target.collectionTypeImplementation;
+ private $target.getterSetterTypeName _$target.name = $target.collectionTypeImplementation;
#else
- private $target.getterSetterTypeName $target.name;
+ private $target.getterSetterTypeName _$target.name;
#end
#end
#end
+
#endregion
- #region Accessors
+ #region Properties
+
## **** Generate accessors for attributes ****
#foreach ( $attribute in $entity.attributes )
#set ($typeName = $attribute.type.fullyQualifiedName)
@@ -73,8 +77,8 @@
/// </summary>
$attribute.visibility virtual $typeName ${stringUtils.upperCamelCaseName($attribute.name)}
{
- get { return $attribute.name; }
- set { this.$attribute.name = value; }
+ get { return _$attribute.name; }
+ set { this._$attribute.name = value; }
}
#end
@@ -87,12 +91,13 @@
/// </summary>
public virtual $target.getterSetterTypeName ${stringUtils.upperCamelCaseName($target.name)}
{
- get { return $target.name; }
- set { this.$target.name = value; }
+ get { return _$target.name; }
+ set { this._$target.name = value; }
}
#end
#end
+
#endregion
#region Abstract Methods
@@ -105,9 +110,11 @@
$operation.visibility abstract $returnType.fullyQualifiedName $signature;
#end
+
#endregion
#region Overriden Methods
+
#if ($generateEntityEqualsAndHashCode.equalsIgnoreCase('true'))
#set ($identifiers = $entity.getIdentifiers(false))
/// <summary>
@@ -177,12 +184,14 @@
#end
return sb.ToString();
}
- #endregion
#end
+ #endregion
+
#if (!$entity.abstract && ($visualStudioVersion != "2003"))
#set ($concreteBaseClass = $entity.generalization && !$entity.generalization.abstract)
#region Factory
+
/// <summary>
/// Constructs new instances of <seealso cref="${entity.fullyQualifiedName}"/>.
/// </summary>
@@ -196,9 +205,12 @@
return new ${entity.fullyQualifiedEntityImplementationName}();
}
}
+
#endregion
+
#end
// HibernateEntity.vsl merge-point
+
}
#if (!$entity.abstract && ($visualStudioVersion == "2003"))
#set ($concreteBaseClass = $entity.generalization && !$entity.generalization.abstract)
1.2 +1 -1 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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- nhibernate.hbm.xml.vsl 8 Mar 2006 04:15:24 -0000 1.1
+++ nhibernate.hbm.xml.vsl 15 Aug 2006 22:48:46 -0000 1.2
@@ -3,7 +3,7 @@
<?xml version="1.0" encoding="$xmlEncoding"?>
<!--
Name: ${entity.entityName}.hbm.xml
- license-header java merge-point
+ license-header hbm merge-point
Attention: Generated code! Do not modify by hand!
Generated by: nhibernate.hbm.xml.vsl in andromda-nhibernate-cartridge.
1.2 +25 -711 cartridges/andromda-nhibernate/src/test/expected/cartridge-output.zip
<<Binary file>>
1.2 +46 -197 cartridges/andromda-nhibernate/src/test/uml/HibernateCartridgeTestModel.xml.zip
<<Binary file>>
1.2 +7 -1 cartridges/andromda-nspring/conf/test/andromda.xml
Index: andromda.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/conf/test/andromda.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- andromda.xml 8 Mar 2006 04:18:50 -0000 1.1
+++ andromda.xml 15 Aug 2006 22:48:47 -0000 1.2
@@ -35,8 +35,14 @@
<property name="hibernateQueryCacheFactory">net.sf.hibernate.cache.StandardQueryCacheFactory</property>
<property name="hibernateInheritanceStrategy">subclass</property>
<property name="springTypesPackage">${application.package}.Domain</property>
+
+ <!-- File output locations -->
<property name="daos">${test.output.dir}</property>
<property name="dao-impls">${test.output.dir}</property>
+ <property name="services">${test.output.dir}</property>
+ <property name="service-interfaces">${test.output.dir}</property>
+ <property name="service-impls">${test.output.dir}</property>
+
</properties>
</namespace>
</namespaces>
1.3 +10 -2 cartridges/andromda-nspring/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/pom.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- pom.xml 14 Jun 2006 15:13:36 -0000 1.2
+++ pom.xml 15 Aug 2006 22:48:47 -0000 1.3
@@ -20,6 +20,14 @@
<role>Developer</role>
</roles>
</developer>
+ <developer>
+ <name>Chris Micali</name>
+ <id>chris</id>
+ <email>ch...@an...</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
</developers>
<dependencies>
<dependency>
@@ -102,9 +110,9 @@
</plugins>
</build>
<properties>
- <maven.test.skip>true</maven.test.skip>
+ <maven.test.skip>false</maven.test.skip>
<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/SpringCartridgeTestModel.xml.zip!/SpringCartridgeTestModel.xml</test.model.uri>
+ <test.model.uri>jar:file:${pom.basedir}/src/test/uml/NSpringCartridgeTestModel.xml.zip!/NSpringCartridgeTestModel.xml</test.model.uri>
<howto.model.uri>jar:file:${pom.basedir}/src/site/xdocs/resources/howto/HowToModel.xml.zip!/HowToModel.xml</howto.model.uri>
</properties>
</project>
\ No newline at end of file
1.3 +4 -4 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NSpringDaoFactory.vsl 25 Mar 2006 03:45:12 -0000 1.2
+++ NSpringDaoFactory.vsl 15 Aug 2006 22:48:47 -0000 1.3
@@ -22,13 +22,13 @@
{
#foreach($entity in $entities)
- private static ${entity.packageName}.I${entity.entityName}Dao ${entity.entityName}Dao = null;
+ private static ${entity.packageName}.I${entity.entityName}Dao _${entity.entityName}Dao = null;
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();
- return ${entity.entityName}Dao;
+ if (_${entity.entityName}Dao == null)
+ _${entity.entityName}Dao = new ${entity.packageName}.${entity.entityName}DaoImpl();
+ return _${entity.entityName}Dao;
}
#end
1.5 +5 -15 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.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- NSpringHibernateDaoBase.vsl 15 Jun 2006 14:59:55 -0000 1.4
+++ NSpringHibernateDaoBase.vsl 15 Aug 2006 22:48:47 -0000 1.5
@@ -57,25 +57,15 @@
#end
#foreach($entityRef in $entity.entityReferences)
- private $entityRef.targetElement.fullyQualifiedDaoName $entityRef.daoName;
-
- /// <summary>
- /// Sets the reference to <code>$entityRef.daoName</code>.
- /// </summary>
- public void ${entityRef.daoSetterName}($entityRef.targetElement.fullyQualifiedDaoName $entityRef.daoName)
+#set ($daoPropertyName = "$stringUtils.capitalize($entityRef.name)Dao")
+ /// <summary>Property to access $daoPropertyName</summary>
+ protected $entityRef.targetElement.fullyQualifiedDaoName $daoPropertyName
{
- this.$entityRef.daoName = $entityRef.daoName;
- }
-
- /// <summary>
- /// Gets the reference to <code>$entityRef.daoName</code>.
- /// </summary>
- protected $entityRef.targetElement.fullyQualifiedDaoName ${entityRef.daoGetterName}()
- {
- return this.$entityRef.daoName;
+ get { return ${springTypesPackage}.DaoFactory.Get$daoPropertyName(); }
}
#end
+
#set ($identifier = $entity.identifiers.iterator().next())
#set ($argumentName = $stringUtils.uncapitalize($entity.name))
/// <summary>
1.2 +1 -1 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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- NSpringServiceImpl.vsl 15 Jun 2006 14:59:55 -0000 1.1
+++ NSpringServiceImpl.vsl 15 Aug 2006 22:48:47 -0000 1.2
@@ -37,7 +37,7 @@
#if ($operation.returnTypePresent)
return $operation.returnType.javaNullString;
#else
- throw new InvalidOperationException("${service.fullyQualifiedName}.${operation.implementationSignature} Not implemented!");
+ throw new Exception("${service.fullyQualifiedName}.${operation.implementationSignature} is not implemented.");
#end
}
1.2 +19 -825 cartridges/andromda-nspring/src/test/expected/cartridge-output.zip
<<Binary file>>
1.1 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate/EntityOne.cs
Index: EntityOne.cs
===================================================================
// Name: EntityOne.cs
// license-header cs merge-point
//
// Attention: Generated code! Do not modify by hand!
// Generated by: HibernateEntity.vsl in andromda-nhibernate-cartridge.
using System;
namespace org.andromda.cartridges.nhibernate
{
/// <summary>
///
/// </summary>
[Serializable]
public abstract class EntityOne
{
#region Hibernate version property
/// <summary>
/// Version property managed by Hibernate.
/// </summary>
private int _version;
public int Version
{
get { return version; }
set { this.version= value; }
}
#endregion
#region Attributes and Associations
private long _longAttribute;
private org.andromda.cartridges.nhibernate.string _stringAttribute;
private DateTime? _dateAttribute;
private long? _id;
private Iesi.Collections.ISet _entityTwos = new Iesi.Collections.HashedSet();
#endregion
#region Properties
/// <summary>
///
/// </summary>
public virtual long LongAttribute
{
get { return _longAttribute; }
set { this._longAttribute = value; }
}
/// <summary>
///
/// </summary>
public virtual org.andromda.cartridges.nhibernate.string StringAttribute
{
get { return _stringAttribute; }
set { this._stringAttribute = value; }
}
/// <summary>
///
/// </summary>
public virtual DateTime? DateAttribute
{
get { return _dateAttribute; }
set { this._dateAttribute = value; }
}
/// <summary>
///
/// </summary>
public virtual long? Id
{
get { return _id; }
set { this._id = value; }
}
/// <summary>
///
/// </summary>
public virtual Iesi.Collections.ISet EntityTwos
{
get { return _entityTwos; }
set { this._entityTwos = value; }
}
#endregion
#region Abstract Methods
/// <summary>
///
/// </summary>
public abstract void operationOne();
#endregion
#region Overriden Methods
/// <summary>
/// Returns <code>true</code> if the argument is a EntityOne instance and all identifiers for this entity
/// equal the identifiers of the argument entity. Returns <code>false</code> otherwise.
/// </summary>
public override bool Equals(Object obj)
{
if (this == obj)
{
return true;
}
if (GetType() != obj.GetType())
{
return false;
}
EntityOne that = (EntityOne)obj;
if (this.Id == null || that.Id == null || !this.Id.Equals(that.Id))
{
return false;
}
return true;
}
/// <summary>
/// Returns a hash code based on this entity's identifiers.
/// </summary>
public override int GetHashCode()
{
int hashCode = 0;
hashCode = 29 * hashCode + (Id == null ? 0 : Id.GetHashCode());
return hashCode;
}
/// <summary>
/// Returns a String representation of this Entity
/// </summary>
public override String ToString()
{
System.Text.StringBuilder sb = new System.Text.StringBuilder();
sb.Append("EntityOne: ");
sb.Append("longAttribute").Append('=').Append(LongAttribute).Append(", ");
sb.Append("stringAttribute").Append('=').Append(StringAttribute).Append(", ");
sb...
[truncated message content] |
|
From: Chris M. <cm...@us...> - 2006-08-15 22:09:37
|
User: cmicali Date: 06/08/15 15:09:35 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges/nspring - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-15 22:09:31
|
User: cmicali Date: 06/08/15 15:09:29 cartridges/andromda-nspring/src/test/expected/org/andromda/cartridges - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-15 22:09:26
|
User: cmicali Date: 06/08/15 15:09:25 cartridges/andromda-nspring/src/test/expected/org/andromda - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-15 22:09:21
|
User: cmicali Date: 06/08/15 15:09:19 cartridges/andromda-nspring/src/test/expected/org - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-15 21:10:49
|
User: cmicali Date: 06/08/15 14:10:48 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges/nhibernate - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-15 21:10:45
|
User: cmicali Date: 06/08/15 14:10:43 cartridges/andromda-nhibernate/src/test/expected/org/andromda/cartridges - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-15 21:10:40
|
User: cmicali Date: 06/08/15 14:10:38 cartridges/andromda-nhibernate/src/test/expected/org/andromda - New directory |
|
From: Chris M. <cm...@us...> - 2006-08-15 21:10:34
|
User: cmicali Date: 06/08/15 14:10:33 cartridges/andromda-nhibernate/src/test/expected/org - New directory |
|
From: Vance K. <va...@us...> - 2006-08-11 15:11:40
|
User: vancek
Date: 06/08/11 08:11:39
Modified: andromda-ejb3/src/changes changes.xml
andromda-ejb3/src/main/resources/templates/ejb3/config
ejb-jar.xml.vsl
Log:
EJB-42 switch transaction-type in ejb-jar.xml to Bean for bean managed transaction demaraction
Revision Changes Path
1.30 +6 -0 cartridges/andromda-ejb3/src/changes/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/changes/changes.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -w -r1.29 -r1.30
--- changes.xml 11 Aug 2006 05:49:48 -0000 1.29
+++ changes.xml 11 Aug 2006 15:11:38 -0000 1.30
@@ -282,6 +282,12 @@
<action dev="vancek" due-to="sverker" type="update">
JIRA EJB-41 - Cleaned unused imports and some calls to deprecated methods changed to their replacements.
</action>
+ <action dev="vancek" due-to="sverker" type="fix">
+ JIRA EJB-42 - Fix IllegalStateException "it is illegal to inject UserTransaction into a CMT bean" where a
+ session bean is modelled with bean managed transactions. This fix sets the <b>transaction-type</b>
+ for the session to <b>Bean</b> instead of <b>Container</b>. This does not affect manageable entity session
+ POJOs as they remain container managed transaction demarcation.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.7 +239 -231 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/ejb-jar.xml.vsl
Index: ejb-jar.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/ejb-jar.xml.vsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- ejb-jar.xml.vsl 14 Jun 2006 04:55:21 -0000 1.6
+++ ejb-jar.xml.vsl 11 Aug 2006 15:11:39 -0000 1.7
@@ -27,7 +27,11 @@
#**##end
<ejb-class>${service.fullyQualifiedServiceName}</ejb-class>
<session-type>${service.type}</session-type>
+#**##if ($service.transactionManagementBean)
+ <transaction-type>Bean</transaction-type>
+#**##else
<transaction-type>Container</transaction-type>
+#**##end
#**##foreach($envEntry in $service.getEnvironmentEntries(true))
<env-entry>
<env-entry-name>${envEntry.name}</env-entry-name>
@@ -77,7 +81,11 @@
</description>
<ejb-name>${mdb.messageDrivenName}</ejb-name>
<ejb-class>${mdb.fullyQualifiedMessageDrivenImplementationName}</ejb-class>
+#**##if ($mdb.transactionManagementBean)
+ <transaction-type>Bean</transaction-type>
+#**##else
<transaction-type>Container</transaction-type>
+#**##end
<message-destination-type>${mdb.destinationType}</message-destination-type>
#**##if ($mdb.transactionManagementBean || $stringUtils.isNotBlank($mdb.messageSelector) || $mdb.destinationTypeTopic || $mdb.minimumPoolSize > 0 || $mdb.maximumPoolSize > 0)
<activation-config>
|
|
From: Vance K. <va...@us...> - 2006-08-11 05:51:08
|
User: vancek
Date: 06/08/10 22:51:08
Modified: andromda-ejb3/src/site/fml faq.fml
Log:
add ear rename faq
Revision Changes Path
1.4 +29 -0 cartridges/andromda-ejb3/src/site/fml/faq.fml
Index: faq.fml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/fml/faq.fml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- faq.fml 1 Jul 2006 03:07:39 -0000 1.3
+++ faq.fml 11 Aug 2006 05:51:08 -0000 1.4
@@ -63,5 +63,34 @@
</p>
</answer>
</faq>
+ <faq id="how_to_rename_ear">
+ <question>How can I rename the EAR file?</question>
+ <answer>
+ <p>
+ In more complex circumstances, you may want to rename your EAR. For JBoss AS, you may have
+ the prefix sorter deployer enabled, in which case you want to prefix a non-negative digit to the EAR.
+ There are a couple of pitfals you need to know about to get this working.
+ </p>
+ <p>
+ In your top-level POM, in the properties section, create an entry to hold the prefix, if you required
+ a prefix. You could name it <b>application.deploy.prefix</b>.
+ </p>
+ <p>
+ In your app folder POM, modify the <code>finalName</code> element under the <code>build</code>
+ element to reflect the prefix above. It would read
+ <code>${application.deploy.prefix}${application.id}-${pom.version}</code>
+ </p>
+ <p>
+ You must also modify the <code>targetPath</code> element in the <code>resource</code> section corresponding
+ to the <b>src/main/application</b> <code>directory</code> element. This would read
+ <code>../${application.deploy.prefix}${application.id}-${pom.version}</code>
+ </p>
+ <p>
+ Finally, make sure you rename the <code>jndiNamePrefix</code> property in the ejb3 namespace of your
+ andromda.xml application descriptor to reflect this change. The <code>jndiNamePrefix</code> would read
+ <code>${application.deploy.prefix}${application.id}-${pom.version}</code>.
+ </p>
+ </answer>
+ </faq>
</part>
</faqs>
|
|
From: Vance K. <va...@us...> - 2006-08-11 05:49:49
|
User: vancek
Date: 06/08/10 22:49:48
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3ManageableEntityFacadeLogicImpl.java
EJB3ManageableEntityAttributeFacadeLogicImpl.java
EJB3SessionOperationFacadeLogicImpl.java
EJB3AssociationFacadeLogicImpl.java
EJB3ManageableEntityAssociationEndFacadeLogicImpl.java
EJB3InterceptorFacadeLogicImpl.java
EJB3MessageDrivenFacadeLogicImpl.java
EJB3OperationFacadeLogicImpl.java
EJB3EntityFacadeLogicImpl.java
EJB3FinderMethodFacadeLogicImpl.java
EJB3EntityAttributeFacadeLogicImpl.java
EJB3SessionFacadeLogicImpl.java
EJB3MetafacadeUtils.java
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3
EJB3ScriptHelper.java
andromda-ejb3 pom.xml
andromda-ejb3/src/changes changes.xml
Log:
EJB-41 - clean unused import and deprecated methods
Revision Changes Path
1.6 +0 -10 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3ManageableEntityFacadeLogicImpl.java
Index: EJB3ManageableEntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3ManageableEntityFacadeLogicImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- EJB3ManageableEntityFacadeLogicImpl.java 10 Jul 2006 05:39:26 -0000 1.5
+++ EJB3ManageableEntityFacadeLogicImpl.java 11 Aug 2006 05:49:46 -0000 1.6
@@ -1,23 +1,13 @@
package org.andromda.cartridges.ejb3.metafacades;
import java.text.MessageFormat;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import java.util.List;
import org.andromda.cartridges.ejb3.EJB3Globals;
-import org.andromda.cartridges.ejb3.EJB3Profile;
-import org.andromda.metafacades.uml.AssociationEndFacade;
import org.andromda.metafacades.uml.AttributeFacade;
-import org.andromda.metafacades.uml.ClassifierFacade;
-import org.andromda.metafacades.uml.Entity;
import org.andromda.metafacades.uml.EntityAttribute;
-import org.andromda.metafacades.uml.ManageableEntityAttribute;
-import org.andromda.metafacades.uml.Role;
import org.andromda.metafacades.uml.UMLProfile;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
1.6 +0 -5 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3ManageableEntityAttributeFacadeLogicImpl.java
Index: EJB3ManageableEntityAttributeFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3ManageableEntityAttributeFacadeLogicImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- EJB3ManageableEntityAttributeFacadeLogicImpl.java 10 Jul 2006 05:29:36 -0000 1.5
+++ EJB3ManageableEntityAttributeFacadeLogicImpl.java 11 Aug 2006 05:49:46 -0000 1.6
@@ -1,10 +1,5 @@
package org.andromda.cartridges.ejb3.metafacades;
-import org.andromda.cartridges.ejb3.EJB3Globals;
-import org.andromda.cartridges.ejb3.EJB3Profile;
-import org.apache.commons.lang.StringUtils;
-
-
/**
* MetafacadeLogic implementation for org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityAttributeFacade.
*
1.14 +0 -2 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionOperationFacadeLogicImpl.java
Index: EJB3SessionOperationFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionOperationFacadeLogicImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- EJB3SessionOperationFacadeLogicImpl.java 15 Jul 2006 05:10:28 -0000 1.13
+++ EJB3SessionOperationFacadeLogicImpl.java 11 Aug 2006 05:49:46 -0000 1.14
@@ -1,7 +1,6 @@
package org.andromda.cartridges.ejb3.metafacades;
import java.text.MessageFormat;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashSet;
@@ -11,7 +10,6 @@
import org.andromda.metafacades.uml.DependencyFacade;
import org.andromda.metafacades.uml.ModelElementFacade;
import org.andromda.metafacades.uml.Role;
-import org.andromda.metafacades.uml.Service;
import org.apache.commons.collections.Closure;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
1.3 +0 -3 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationFacadeLogicImpl.java
Index: EJB3AssociationFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationFacadeLogicImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EJB3AssociationFacadeLogicImpl.java 6 Jan 2006 13:55:19 -0000 1.2
+++ EJB3AssociationFacadeLogicImpl.java 11 Aug 2006 05:49:46 -0000 1.3
@@ -1,8 +1,5 @@
package org.andromda.cartridges.ejb3.metafacades;
-import org.andromda.cartridges.ejb3.EJB3Profile;
-
-
/**
* MetafacadeLogic implementation for org.andromda.cartridges.ejb3.metafacades.EJB3AssociationFacade.
*
1.4 +0 -12 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3ManageableEntityAssociationEndFacadeLogicImpl.java
Index: EJB3ManageableEntityAssociationEndFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3ManageableEntityAssociationEndFacadeLogicImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- EJB3ManageableEntityAssociationEndFacadeLogicImpl.java 26 Jun 2006 06:53:32 -0000 1.3
+++ EJB3ManageableEntityAssociationEndFacadeLogicImpl.java 11 Aug 2006 05:49:46 -0000 1.4
@@ -1,17 +1,5 @@
package org.andromda.cartridges.ejb3.metafacades;
-import java.text.MessageFormat;
-
-import org.andromda.cartridges.ejb3.EJB3Globals;
-import org.andromda.metafacades.uml.ClassifierFacade;
-import org.andromda.metafacades.uml.TypeMappings;
-import org.andromda.metafacades.uml.UMLMetafacadeProperties;
-import org.andromda.metafacades.uml.UMLMetafacadeUtils;
-import org.andromda.metafacades.uml.UMLProfile;
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
-
-
/**
* MetafacadeLogic implementation for org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityAssociationEndFacade.
*
1.4 +0 -2 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3InterceptorFacadeLogicImpl.java
Index: EJB3InterceptorFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3InterceptorFacadeLogicImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- EJB3InterceptorFacadeLogicImpl.java 16 Mar 2006 02:16:31 -0000 1.3
+++ EJB3InterceptorFacadeLogicImpl.java 11 Aug 2006 05:49:46 -0000 1.4
@@ -1,9 +1,7 @@
package org.andromda.cartridges.ejb3.metafacades;
import java.text.MessageFormat;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import org.andromda.cartridges.ejb3.EJB3Profile;
1.8 +0 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MessageDrivenFacadeLogicImpl.java
Index: EJB3MessageDrivenFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MessageDrivenFacadeLogicImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- EJB3MessageDrivenFacadeLogicImpl.java 3 Jun 2006 15:36:48 -0000 1.7
+++ EJB3MessageDrivenFacadeLogicImpl.java 11 Aug 2006 05:49:46 -0000 1.8
@@ -1,7 +1,6 @@
package org.andromda.cartridges.ejb3.metafacades;
import java.text.MessageFormat;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashSet;
1.6 +0 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3OperationFacadeLogicImpl.java
Index: EJB3OperationFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3OperationFacadeLogicImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- EJB3OperationFacadeLogicImpl.java 30 Apr 2006 01:58:53 -0000 1.5
+++ EJB3OperationFacadeLogicImpl.java 11 Aug 2006 05:49:46 -0000 1.6
@@ -4,7 +4,6 @@
import org.andromda.cartridges.ejb3.EJB3Globals;
import org.andromda.cartridges.ejb3.EJB3Profile;
-import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
1.25 +7 -3 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.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- EJB3EntityFacadeLogicImpl.java 14 Jun 2006 04:55:21 -0000 1.24
+++ EJB3EntityFacadeLogicImpl.java 11 Aug 2006 05:49:46 -0000 1.25
@@ -736,7 +736,7 @@
(String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_DISCRIMINATOR_COLUMN_LENGTH);
if (StringUtils.isNotBlank(lengthAsStr))
{
- length = NumberUtils.stringToInt(lengthAsStr);
+ length = NumberUtils.toInt(lengthAsStr);
}
return length;
}
@@ -1305,6 +1305,8 @@
}
return new FilteredCollection(sourceDependencies)
{
+ private static final long serialVersionUID = -8193885902084039620L;
+
public boolean evaluate(Object object)
{
boolean valid = false;
@@ -1391,6 +1393,8 @@
{
return new FilteredCollection(this.getAttributes(follow, withIdentifiers))
{
+ private static final long serialVersionUID = -8511475954374453779L;
+
public boolean evaluate(Object object)
{
return !((AttributeFacade)object).isStatic();
1.11 +0 -2 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodFacadeLogicImpl.java
Index: EJB3FinderMethodFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3FinderMethodFacadeLogicImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- EJB3FinderMethodFacadeLogicImpl.java 29 May 2006 01:44:27 -0000 1.10
+++ EJB3FinderMethodFacadeLogicImpl.java 11 Aug 2006 05:49:46 -0000 1.11
@@ -3,10 +3,8 @@
import java.util.Collection;
import java.util.Iterator;
-import org.andromda.cartridges.ejb3.EJB3Globals;
import org.andromda.cartridges.ejb3.EJB3Profile;
import org.andromda.metafacades.uml.ModelElementFacade;
-import org.andromda.metafacades.uml.ParameterFacade;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
1.17 +0 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityAttributeFacadeLogicImpl.java
Index: EJB3EntityAttributeFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityAttributeFacadeLogicImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- EJB3EntityAttributeFacadeLogicImpl.java 10 Jul 2006 05:29:36 -0000 1.16
+++ EJB3EntityAttributeFacadeLogicImpl.java 11 Aug 2006 05:49:46 -0000 1.17
@@ -1,6 +1,5 @@
package org.andromda.cartridges.ejb3.metafacades;
-import java.util.Collection;
import java.util.Iterator;
import org.andromda.cartridges.ejb3.EJB3Globals;
1.18 +0 -2 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionFacadeLogicImpl.java
Index: EJB3SessionFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionFacadeLogicImpl.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- EJB3SessionFacadeLogicImpl.java 14 Jun 2006 05:04:03 -0000 1.17
+++ EJB3SessionFacadeLogicImpl.java 11 Aug 2006 05:49:46 -0000 1.18
@@ -1,14 +1,12 @@
package org.andromda.cartridges.ejb3.metafacades;
import java.text.MessageFormat;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashSet;
import org.andromda.cartridges.ejb3.EJB3Globals;
import org.andromda.cartridges.ejb3.EJB3Profile;
-import org.andromda.cartridges.ejb3.metafacades.EJB3OperationFacade;
import org.andromda.metafacades.uml.DependencyFacade;
import org.andromda.metafacades.uml.ModelElementFacade;
import org.andromda.metafacades.uml.OperationFacade;
1.7 +12 -26 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MetafacadeUtils.java
Index: EJB3MetafacadeUtils.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3MetafacadeUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- EJB3MetafacadeUtils.java 14 Jun 2006 05:01:13 -0000 1.6
+++ EJB3MetafacadeUtils.java 11 Aug 2006 05:49:46 -0000 1.7
@@ -5,13 +5,11 @@
import org.andromda.core.common.ExceptionUtils;
import org.andromda.metafacades.uml.AttributeFacade;
import org.andromda.metafacades.uml.ClassifierFacade;
-import org.andromda.metafacades.uml.DependencyFacade;
import org.andromda.metafacades.uml.ModelElementFacade;
import org.andromda.metafacades.uml.OperationFacade;
import org.andromda.metafacades.uml.UMLProfile;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
-import org.apache.commons.collections.Transformer;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
@@ -39,8 +37,7 @@
ClassifierFacade classifier,
boolean follow)
{
- final String methodName = "EJBMetafacadeUtils.getCreateMethods";
- ExceptionUtils.checkNull(methodName, "classifer", classifier);
+ ExceptionUtils.checkNull("classifer", classifier);
Collection retval = new ArrayList();
ClassifierFacade entity = classifier;
do
@@ -71,8 +68,7 @@
*/
static String getHomeInterfaceName(ClassifierFacade classifier)
{
- final String methodName = "EJBMetafacadeUtils.getHomeInterfaceName";
- ExceptionUtils.checkNull(methodName, "classifer", classifier);
+ ExceptionUtils.checkNull("classifer", classifier);
String homeInterfaceName;
if (classifier.hasStereotype(UMLProfile.STEREOTYPE_ENTITY))
{
@@ -101,8 +97,7 @@
ClassifierFacade classifier,
String defaultViewType)
{
- final String methodName = "EJBMetafacadeUtils.getViewType";
- ExceptionUtils.checkNull(methodName, "classifer", classifier);
+ ExceptionUtils.checkNull("classifer", classifier);
String viewType = (String)classifier.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_VIEWTYPE);
if (StringUtils.isEmpty(viewType))
{
@@ -141,8 +136,7 @@
*/
static List getInheritedInstanceAttributes(ClassifierFacade classifier)
{
- final String methodName = "EJBMetafacadeUtils.getInheritedInstanceAttributes";
- ExceptionUtils.checkNull(methodName, "classifer", classifier);
+ ExceptionUtils.checkNull("classifer", classifier);
ClassifierFacade current = (ClassifierFacade)classifier.getGeneralization();
if (current == null)
{
@@ -166,8 +160,7 @@
*/
static List getAllInstanceAttributes(ClassifierFacade classifier)
{
- final String methodName = "EJBMetafacadeUtils.getAllInstanceAttributes";
- ExceptionUtils.checkNull(methodName, "classifer", classifier);
+ ExceptionUtils.checkNull("classifer", classifier);
List retval = getInheritedInstanceAttributes(classifier);
retval.addAll(classifier.getInstanceAttributes());
return retval;
@@ -187,8 +180,7 @@
ClassifierFacade classifier,
boolean follow)
{
- final String methodName = "EJBMetafacadeUtils.getEnvironmentEntries";
- ExceptionUtils.checkNull(methodName, "classifer", classifier);
+ ExceptionUtils.checkNull("classifer", classifier);
Collection attributes = classifier.getStaticAttributes();
@@ -221,8 +213,7 @@
*/
static String getTransactionType(ClassifierFacade classifier, String defaultTransactionType)
{
- final String methodName = "EJBMetafacadeUtils.getTransactionType";
- ExceptionUtils.checkNull(methodName, "classifer", classifier);
+ ExceptionUtils.checkNull("classifer", classifier);
String transactionType = (String)classifier.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_TRANSACTION_TYPE);
if (StringUtils.isNotBlank(transactionType))
@@ -246,8 +237,7 @@
*/
static String convertTransactionType(String transType)
{
- final String methodName = "EJBMetafacadeUtils.convertTransactionType";
- ExceptionUtils.checkNull(methodName, "transType", transType);
+ ExceptionUtils.checkNull("transType", transType);
String type = null;
if (StringUtils.equalsIgnoreCase(transType, EJB3Globals.TRANSACTION_TYPE_MANDATORY))
@@ -292,8 +282,7 @@
ClassifierFacade classifier,
boolean follow)
{
- final String methodName = "EJBMetafacadeUtils.getConstants";
- ExceptionUtils.checkNull(methodName, "classifer", classifier);
+ ExceptionUtils.checkNull("classifer", classifier);
Collection attributes = classifier.getStaticAttributes();
@@ -325,8 +314,7 @@
*/
static boolean allowSyntheticCreateMethod(ClassifierFacade classifier)
{
- final String methodName = "EJBMetafacadeUtils.allowSyntheticCreateMethod";
- ExceptionUtils.checkNull(methodName, "classifer", classifier);
+ ExceptionUtils.checkNull("classifer", classifier);
return !classifier.isAbstract() && classifier.findTaggedValue(
EJB3Profile.TAGGEDVALUE_EJB_NO_SYNTHETIC_CREATE_METHOD) == null;
}
@@ -383,8 +371,7 @@
*/
static String getSeamComponentScopeType(ClassifierFacade classifier, boolean stateless)
{
- final String methodName = "EJBMetafacadeUtils.getSeamComponentScopeType";
- ExceptionUtils.checkNull(methodName, "classifer", classifier);
+ ExceptionUtils.checkNull("classifer", classifier);
return (String)classifier.findTaggedValue(EJB3Profile.TAGGEDVALUE_SEAM_SCOPE_TYPE);
}
@@ -397,8 +384,7 @@
*/
static String getSeamComponentName(ClassifierFacade classifier)
{
- final String methodName = "EJBMetafacadeUtils.getSeamComponentName";
- ExceptionUtils.checkNull(methodName, "classifer", classifier);
+ ExceptionUtils.checkNull("classifer", classifier);
String componentName = (String)classifier.findTaggedValue(EJB3Profile.TAGGEDVALUE_SEAM_COMPONENT_NAME);
if (StringUtils.isBlank(componentName))
{
1.9 +0 -3 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3ScriptHelper.java
Index: EJB3ScriptHelper.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3ScriptHelper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- EJB3ScriptHelper.java 11 Apr 2006 16:09:44 -0000 1.8
+++ EJB3ScriptHelper.java 11 Aug 2006 05:49:47 -0000 1.9
@@ -1,9 +1,6 @@
package org.andromda.cartridges.ejb3;
import org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacade;
-import org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade;
-import org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade;
-import org.andromda.metafacades.uml.AttributeFacade;
import org.andromda.metafacades.uml.ModelElementFacade;
import org.apache.commons.lang.StringUtils;
1.8 +2 -0 cartridges/andromda-ejb3/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/pom.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- pom.xml 26 Jun 2006 14:40:34 -0000 1.7
+++ pom.xml 11 Aug 2006 05:49:48 -0000 1.8
@@ -125,6 +125,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
@@ -155,6 +156,7 @@
</reportSet>
</reportSets>
</plugin>
+ -->
</plugins>
</reporting>
<properties>
1.29 +3 -0 cartridges/andromda-ejb3/src/changes/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/changes/changes.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -w -r1.28 -r1.29
--- changes.xml 29 Jul 2006 09:46:29 -0000 1.28
+++ changes.xml 11 Aug 2006 05:49:48 -0000 1.29
@@ -279,6 +279,9 @@
<action dev="vancek" type="update">
Updated installation howto to give more accurate directions on getting and building the EJB3 cartridge.
</action>
+ <action dev="vancek" due-to="sverker" type="update">
+ JIRA EJB-41 - Cleaned unused imports and some calls to deprecated methods changed to their replacements.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
|
From: Eric C. <ecr...@us...> - 2006-08-04 22:42:59
|
User: ecrutchfield
Date: 06/08/04 15:42:58
Removed: andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/lib
NHibernate.dll NHibernate.Caches.SysCache.dll
HashCodeProvider.dll Iesi.Collections.dll
log4net.dll NHibernate.Nullables2.dll
Castle.DynamicProxy.dll Bamboo.Prevalence.dll
NHibernate.Caches.Prevalence.dll
AndroMDA.NHibernateSupport.dll
Log:
dll's no longer needed since pulling from /etc/andromda-net
|
|
From: Eric C. <ecr...@us...> - 2006-08-04 22:42:21
|
User: ecrutchfield
Date: 06/08/04 15:42:21
Modified: andromdapp/projects/csharp/maven2/src/main/resources/META-INF/andromdapp
andromdapp.xml
Log:
added shorttext element to be compatible with DTD in v3.2
Revision Changes Path
1.4 +25 -16 plugins/andromdapp/projects/csharp/maven2/src/main/resources/META-INF/andromdapp/andromdapp.xml
Index: andromdapp.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/META-INF/andromdapp/andromdapp.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- andromdapp.xml 17 Mar 2006 03:52:08 -0000 1.3
+++ andromdapp.xml 4 Aug 2006 22:42:21 -0000 1.4
@@ -70,24 +70,31 @@
</documentation>
<prompt id="applicationParentDirectory">
<text>Please enter the location in which your new application will be created (i.e. c:/csharp/development)</text>
+ <shortText>Application location</shortText>
</prompt>
<prompt id="author">
<text>Please enter your first and last name (i.e. Naresh Bhatia)</text>
+ <shortText>Author</shortText>
</prompt>
<prompt id="applicationName">
<text>Please enter the name of your .NET project (i.e. Time Tracker)</text>
+ <shortText>Application name</shortText>
</prompt>
<prompt id="applicationId">
<text>Please enter an id for your .NET project (i.e. timetracker)</text>
+ <shortText>Application ID</shortText>
</prompt>
<prompt id="applicationPackage">
<text>Please enter the root namespace for your .NET project (i.e. org.andromda.samples.timetracker)</text>
+ <shortText>Application namespace</shortText>
</prompt>
<prompt id="applicationVersion">
<text>Please enter a version for your project (i.e. 1.0-SNAPSHOT)</text>
+ <shortText>Version</shortText>
</prompt>
<prompt id="dotNetVersion" setResponseAsTrue="true">
<text>What version of the .Net Framework will you be targeting?</text>
+ <shortText>.NET Framework version</shortText>
<responses>
<response>1.1</response>
<response>2.0</response>
@@ -107,6 +114,7 @@
</documentation>
<prompt id="transactionPersistenceType" setResponseAsTrue="true">
<text>Please enter the type of transactional/persistence cartridge to use. Note: The spring cartridge uses nhibernate.</text>
+ <shortText>Persistence framework</shortText>
<responses>
<response>nhibernate</response>
<response>nspring</response>
@@ -140,6 +148,7 @@
-->
<prompt id="web">
<text>Do you want to generate an ASP.NET application?</text>
+ <shortText>Web interface</shortText>
<responses type="java.lang.Boolean">
<response>yes</response>
<response>no</response>
|
|
From: Eric C. <ecr...@us...> - 2006-08-04 22:42:12
|
User: ecrutchfield
Date: 06/08/04 15:42:11
Modified: andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/common
pom.xml.vsl
andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf
andromda.xml.vsl
andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2
pom.xml.vsl
Log:
fix depdencies and update to use version 3.2
Revision Changes Path
1.2 +1 -19 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/common/pom.xml.vsl
Index: pom.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/common/pom.xml.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- pom.xml.vsl 5 Mar 2006 06:16:52 -0000 1.1
+++ pom.xml.vsl 4 Aug 2006 22:42:11 -0000 1.2
@@ -10,22 +10,4 @@
<artifactId>${applicationId}-common</artifactId>
<packaging>pom</packaging>
<name>${applicationName} Common</name>
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${applicationId}-mda</artifactId>
- <version>${pom.version}</version>
- <type>pom</type>
- <scope>runtime</scope>
- <optional>true</optional>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.andromda.maven.plugins</groupId>
- <artifactId>andromda-multi-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
1.8 +2 -4 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf/andromda.xml.vsl
Index: andromda.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/conf/andromda.xml.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- andromda.xml.vsl 9 Apr 2006 18:02:12 -0000 1.7
+++ andromda.xml.vsl 4 Aug 2006 22:42:11 -0000 1.8
@@ -127,7 +127,6 @@
<property name="web_generated">${web.generated.dir}</property>
<property name="web_manual">${web.manual.dir}</property>
<property name="webAssemblyName">${applicationPackage}.web</property>
- #if (${dotNetVersion}=="1.1")
<property name="AssemblyTitle">${applicationName}</property>
<property name="AssemblyDescription"></property>
<property name="AssemblyConfiguration"></property>
@@ -140,7 +139,6 @@
<property name="AssemblyDelaySign">true</property>
<property name="AssemblyKeyFile"></property>
<property name="AssemblyKeyName"></property>
- #end
</properties>
</namespace>
#end
1.3 +14 -14 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/pom.xml.vsl
Index: pom.xml.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/pom.xml.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- pom.xml.vsl 6 Mar 2006 20:24:48 -0000 1.2
+++ pom.xml.vsl 4 Aug 2006 22:42:11 -0000 1.3
@@ -50,14 +50,14 @@
</dependency>
<!-- Specify and configure our cartridges -->
<dependency>
- <groupId>andromda</groupId>
+ <groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-cs-cartridge</artifactId>
<version>$andromdapluginsVersion</version>
<type>jar</type>
</dependency>
#if ($web)
<dependency>
- <groupId>andromda</groupId>
+ <groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-aspdotnet-cartridge</artifactId>
<version>$andromdapluginsVersion</version>
<type>jar</type>
@@ -65,7 +65,7 @@
#end
#if ($nspring)
<dependency>
- <groupId>andromda</groupId>
+ <groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-nspring-cartridge</artifactId>
<version>$andromdapluginsVersion</version>
<type>jar</type>
@@ -81,7 +81,7 @@
<version>$andromdaVersion</version>
</dependency>
<dependency>
- <groupId>andromda</groupId>
+ <groupId>org.andromda.translationlibraries</groupId>
<artifactId>andromda-ocl-query-library</artifactId>
<version>$andromdaVersion</version>
<type>jar</type>
@@ -89,7 +89,7 @@
#end
#if ($nhibernate)
<dependency>
- <groupId>andromda</groupId>
+ <groupId>org.andromda.cartridges</groupId>
<artifactId>andromda-nhibernate-cartridge</artifactId>
<version>$andromdapluginsVersion</version>
<type>jar</type>
@@ -137,14 +137,13 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>andromdapp-maven-plugin</artifactId>
- <version>$andromdaVersion</version>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.1</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<modules>
- <module>mda</module>
<module>common</module>
#if (${transactionPersistenceType} != "none")
<module>core</module>
@@ -155,6 +154,7 @@
#if ($webservice)
<module>webservice</module>
#end
+ <module>mda</module>
</modules>
<properties>
<!--
@@ -203,7 +203,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>andromdapp-maven-plugin</artifactId>
- <version>3.2-RC1-SNAPSHOT</version>
+ <version>3.2-SNAPSHOT</version>
<!-- provides the injection of the script wrapper support into the class files (this should only
be done when developing locally), uncomment this executions element to enable
<executions>
|
|
From: Eric C. <ecr...@us...> - 2006-08-04 16:19:02
|
User: ecrutchfield
Date: 06/08/04 09:19:00
Modified: andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/src/main/uml
empty-model.xmi
Log:
copy of v3.X model from /andromda/etc/mda/uml
Revision Changes Path
1.2 +39 -23 plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/src/main/uml/empty-model.xmi
Index: empty-model.xmi
===================================================================
RCS file: /cvsroot/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/src/main/resources/templates/csharp/maven2/mda/src/main/uml/empty-model.xmi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- empty-model.xmi 5 Mar 2006 06:16:54 -0000 1.1
+++ empty-model.xmi 4 Aug 2006 16:19:00 -0000 1.2
@@ -19,7 +19,7 @@
</XMI.extension>
<UML:Namespace.ownedElement>
<UML:Package xmi.id='eee_1045467100313_365297_7' name='Component View' isRoot='false' isLeaf='false' isAbstract='false'/>
- <UML:Package href='andromda-profile-3.2-RC1-SNAPSHOT.xml.zip|_8a70287_1078771814628_224704_589'>
+ <UML:Package href='andromda-profile-3.2-SNAPSHOT.xml.zip|_8a70287_1078771814628_224704_589'>
<XMI.extension xmi.extender='MagicDraw UML 9.0' xmi.extenderID='MagicDraw UML 9.0'>
<referentPath xmi.value='::org.andromda.profile'/>
</XMI.extension>
@@ -53,34 +53,50 @@
<propertyID>MODULES_DIRS</propertyID>
<propertyDescriptionID>MODULES_DIRS_DESCRIPTION</propertyDescriptionID>
<mdElement elementClass='FileProperty'>
- <value><install.root>\profiles</value>
- <selectionMode xmi.value='0'/>
+ <value><maven2.repository>/org/andromda/profiles/uml14/andromda-profile/3.2-SNAPSHOT/</value>
+ <selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value>C:\Documents and Settings\Administrator\.maven\repository\andromda\xml.zips</value>
- <selectionMode xmi.value='0'/>
+ <value><maven2.repository>/org/andromda/profiles/uml14/andromda-profile-datatype/3.2-SNAPSHOT/</value>
+ <selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value>C:\Documents and Settings\Administrator\.maven\repository\andromda\xml.zips</value>
- <selectionMode xmi.value='0'/>
+ <value><maven2.repository>/org/andromda/profiles/uml14/andromda-profile-meta/3.2-SNAPSHOT/</value>
+ <selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value>C:\Documents and Settings\Administrator\.maven\repository\andromda\xml.zips\</value>
- <selectionMode xmi.value='0'/>
+ <value><maven2.repository>/org/andromda/profiles/uml14/andromda-profile-persistence/3.2-SNAPSHOT/</value>
+ <selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value>C:\Documents and Settings\cbrandon\.maven\repository\andromda\xml.zips\</value>
- <selectionMode xmi.value='0'/>
+ <value><maven2.repository>/org/andromda/profiles/uml14/andromda-profile-presentation/3.2-SNAPSHOT/</value>
+ <selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value>C:\Documents and Settings\ZOO\.maven\repository\andromda\xml.zips\</value>
- <selectionMode xmi.value='0'/>
+ <value><maven2.repository>/org/andromda/profiles/uml14/andromda-profile-process/3.2-SNAPSHOT/</value>
+ <selectionMode xmi.value='2'/>
</mdElement>
<mdElement elementClass='FileProperty'>
- <value>C:\Documents and Settings\cwbrandon\.maven\repository\andromda\xml.zips\</value>
- <selectionMode xmi.value='0'/>
+ <value><maven2.repository>/org/andromda/profiles/uml14/andromda-profile-service/3.2-SNAPSHOT/</value>
+ <selectionMode xmi.value='2'/>
</mdElement>
- <value xmi.value='false'/>
+ <mdElement elementClass='FileProperty'>
+ <value><maven2.repository>/org/andromda/profiles/uml14/andromda-profiles-uml14/3.2-SNAPSHOT/</value>
+ <selectionMode xmi.value='2'/>
+ </mdElement>
+ <mdElement elementClass='FileProperty'>
+ <value><maven2.repository>/org/andromda/profiles/uml14/andromda-profile-webservice/3.2-SNAPSHOT/</value>
+ <selectionMode xmi.value='2'/>
+ </mdElement>
+ <mdElement elementClass='FileProperty'>
+ <value><maven2.repository>/org/andromda/profiles/uml14/andromda-profile-xml/3.2-SNAPSHOT/</value>
+ <selectionMode xmi.value='2'/>
+ </mdElement>
+ <mdElement elementClass='FileProperty'>
+ <value><maven1.repository>/andromda/xml.zips/</value>
+ <selectionMode xmi.value='2'/>
+ </mdElement>
+ <value xmi.value='true'/>
</mdElement>
</mdElement>
<mdElement elementClass='PropertyManager'>
|
