Menu
▾
▴
andromdaplugins-cvs — Each commit to the project CVS repository posts a message to this mailing list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(178) |
Feb
(169) |
Mar
(286) |
Apr
(117) |
May
(98) |
Jun
(68) |
Jul
(63) |
Aug
(121) |
Sep
(88) |
Oct
(124) |
Nov
(2) |
Dec
(111) |
| 2007 |
Jan
(224) |
Feb
(69) |
Mar
(10) |
Apr
(72) |
May
(7) |
Jun
(21) |
Jul
(33) |
Aug
(35) |
Sep
(12) |
Oct
(22) |
Nov
(5) |
Dec
(6) |
| 2008 |
Jan
(2) |
Feb
(10) |
Mar
(39) |
Apr
(58) |
May
(34) |
Jun
(9) |
Jul
(27) |
Aug
(10) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
|
From: Vance K. <va...@us...> - 2006-06-26 14:40:40
|
User: vancek
Date: 06/06/26 07:40:34
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3ManageableEntityAttributeFacadeLogicImpl.java
EJB3AssociationEndFacadeLogicImpl.java
EJB3EntityAttributeFacadeLogicImpl.java
andromda-ejb3 pom.xml
andromda-ejb3/src/changes changes.xml
Log:
changed back to be jdk 1.4 compliant (remove @Override)
Revision Changes Path
1.4 +0 -1 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- EJB3ManageableEntityAttributeFacadeLogicImpl.java 26 Jun 2006 06:53:32 -0000 1.3
+++ EJB3ManageableEntityAttributeFacadeLogicImpl.java 26 Jun 2006 14:40:34 -0000 1.4
@@ -26,7 +26,6 @@
/**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityAttributeFacadeLogic#getTemporalType()
*/
- @Override
public String getTemporalType()
{
String temporalType = super.getTemporalType();
1.11 +0 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationEndFacadeLogicImpl.java
Index: EJB3AssociationEndFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationEndFacadeLogicImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- EJB3AssociationEndFacadeLogicImpl.java 26 Jun 2006 06:53:32 -0000 1.10
+++ EJB3AssociationEndFacadeLogicImpl.java 26 Jun 2006 14:40:34 -0000 1.11
@@ -198,7 +198,6 @@
/**
* @see org.andromda.metafacades.uml.AssociationEndFacade#getGetterSetterTypeName()
*/
- @Override
public String getGetterSetterTypeName()
{
String getterSetterTypeName = null;
1.15 +0 -5 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.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- EJB3EntityAttributeFacadeLogicImpl.java 26 Jun 2006 06:53:32 -0000 1.14
+++ EJB3EntityAttributeFacadeLogicImpl.java 26 Jun 2006 14:40:34 -0000 1.15
@@ -52,7 +52,6 @@
/**
* @see org.andromda.metafacades.uml.AttributeFacade#getGetterName()
*/
- @Override
public String getGetterName()
{
return "get" + StringUtils.capitalize(super.getName());
@@ -63,7 +62,6 @@
*
* @see org.andromda.metafacades.uml.AttributeFacade#isRequired()
*/
- @Override
public boolean isRequired()
{
boolean required = super.isRequired();
@@ -88,7 +86,6 @@
*
* @see org.andromda.metafacades.uml.AttributeFacade#getDefaultValue()
*/
- @Override
public String getDefaultValue()
{
String defaultValue = super.getDefaultValue();
@@ -367,7 +364,6 @@
*
* @see org.andromda.metafacades.uml.EntityAttribute#getColumnLength()
*/
- @Override
public String getColumnLength()
{
String columnLength = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_COLUMN_LENGTH);
@@ -384,7 +380,6 @@
*
* @see org.andromda.metafacades.uml.EntityAttribute#getColumnName()
*/
- @Override
public String getColumnName()
{
String columnName = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_COLUMN);
1.7 +0 -8 cartridges/andromda-ejb3/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/pom.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- pom.xml 26 Jun 2006 06:55:08 -0000 1.6
+++ pom.xml 26 Jun 2006 14:40:34 -0000 1.7
@@ -41,14 +41,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-maven-plugin</artifactId>
<dependencies>
1.11 +4 -0 cartridges/andromda-ejb3/src/changes/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/changes/changes.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- changes.xml 26 Jun 2006 14:21:50 -0000 1.10
+++ changes.xml 26 Jun 2006 14:40:34 -0000 1.11
@@ -173,6 +173,10 @@
Fix erroneous signature of entity constructor where no entity attributes exist but navigable associations
do exist.
</action>
+ <action dev="vancek" type="update">
+ Revert the build back to using the default Java compiler (1.4) - 1.5 isn't supported for the automated
+ build process for andromda-plugins.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-06-26 14:21:55
|
User: vancek
Date: 06/06/26 07:21:51
Modified: andromda-ejb3/src/changes changes.xml
andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
Log:
fix JIRA EJB-34 - invalid entity constructure signature if the entity is without attributes but contains navigable associations
Revision Changes Path
1.10 +4 -0 cartridges/andromda-ejb3/src/changes/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/changes/changes.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- changes.xml 26 Jun 2006 06:53:33 -0000 1.9
+++ changes.xml 26 Jun 2006 14:21:50 -0000 1.10
@@ -169,6 +169,10 @@
set. EJB3ManageableEntityAttributeFacade also extends EJB3EntityAttributeFacade. This eliminates the
need for the existing overwritten methods in the manageable entity facades.
</action>
+ <action dev="vancek" due-to="tlu" type="fix">
+ Fix erroneous signature of entity constructor where no entity attributes exist but navigable associations
+ do exist.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.34 +8 -7 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
Index: EntityEmbeddable.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -w -r1.33 -r1.34
--- EntityEmbeddable.vsl 26 Jun 2006 06:37:12 -0000 1.33
+++ EntityEmbeddable.vsl 26 Jun 2006 14:21:51 -0000 1.34
@@ -239,7 +239,8 @@
* This method sets all POJO fields defined in this class to the values provided by
* the parameters.
*
-#**##foreach($attribute in $transform.filterUpdatableAttributes($allAttributes, $entity.compositePrimaryKeyPresent))
+#**##set ($updatableAttributes = $transform.filterUpdatableAttributes($allAttributes, $entity.compositePrimaryKeyPresent))
+#**##foreach($attribute in $updatableAttributes)
* @param $attribute.name Value for the ${attribute.name} property
#**##end
*/
@@ -248,7 +249,7 @@
#**##if(!$inheritedAttributes.empty)
super($entity.getAttributesAsList($inheritedAttributes, false, true, false));
#**##end
-#**##foreach ($attribute in $transform.filterUpdatableAttributes($instanceAttributes, $entity.compositePrimaryKeyPresent))
+#**##foreach ($attribute in $updatableAttributes)
${attribute.setterName}(${attribute.name});
#**##end
}
@@ -260,20 +261,20 @@
/**
* Constructor with all POJO attribute values and CMR relations.
*
-#* *##foreach($attribute in $transform.filterUpdatableAttributes($allAttributes, $entity.compositePrimaryKeyPresent))
+#* *##set ($updatableAttributes = $transform.filterUpdatableAttributes($allAttributes, $entity.compositePrimaryKeyPresent))
+#* *##foreach($attribute in $updatableAttributes)
* @param $attribute.name Value for the ${attribute.name} property
#* *##end
#* *##foreach ($relation in $relations)
* @param $relation.otherEnd.name Value for the ${relation.otherEnd.name} relation role
#* *##end
*/
- public #if ($entity.entityImplementationRequired || $entity.embeddableSuperclass)${entity.entityEmbeddableName}#else${entity.entityName}#end($entity.getAttributesAsList($allAttributes, true, true, false)#if(!$allAttributes.empty), #end#foreach ($relation in $relations)${relation.otherEnd.getterSetterTypeName} $relation.otherEnd.name#if($velocityCount != $relations.size()), #end#end)
+ public #if ($entity.entityImplementationRequired || $entity.embeddableSuperclass)${entity.entityEmbeddableName}#else${entity.entityName}#end($entity.getAttributesAsList($allAttributes, true, true, false)#if(!$updatableAttributes.empty), #end#foreach ($relation in $relations)${relation.otherEnd.getterSetterTypeName} $relation.otherEnd.name#if($velocityCount != $relations.size()), #end#end)
{
-#* *##foreach ($attribute in $transform.filterUpdatableAttributes($instanceAttributes, $entity.compositePrimaryKeyPresent))
+#* *##foreach ($attribute in $updatableAttributes)
${attribute.setterName}(${attribute.name});
#* *##end
- // Set the CMR relations
#* *##foreach ($relation in $relations)
${relation.otherEnd.setterName}($relation.otherEnd.name);
#* *##end
|
|
From: Vance K. <va...@us...> - 2006-06-26 06:56:51
|
User: vancek
Date: 06/06/25 23:56:51
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
namespace.xml profile.xml
Log:
add support for default list, set and map types for collection association ends
added ability to set association end collection index name and type for map index
set default collection interface for association ends java.util.SortedSet from java.util.Collection
Revision Changes Path
1.25 +45 -1 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/namespace.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- namespace.xml 14 Jun 2006 08:08:47 -0000 1.24
+++ namespace.xml 26 Jun 2006 06:56:51 -0000 1.25
@@ -957,6 +957,24 @@
Manager.
</documentation>
</property>
+ <property name="listTypeImplementation">
+ <default>java.util.ArrayList</default>
+ <documentation>
+ The implementation type to use for association ends that are modeled as lists.
+ </documentation>
+ </property>
+ <property name="setTypeImplementation">
+ <default>java.util.TreeSet</default>
+ <documentation>
+ The implementation type to use for association ends that are modeled as sets.
+ </documentation>
+ </property>
+ <property name="mapTypeImplementation">
+ <default>java.util.HashMap</default>
+ <documentation>
+ The implementation type to use for association ends that are modeled as maps.
+ </documentation>
+ </property>
<property name="specificCollectionInterfaces">
<default>false</default>
<documentation>
@@ -968,7 +986,7 @@
</documentation>
</property>
<property name="defaultCollectionInterface">
- <default>java.util.Collection</default>
+ <default>java.util.SortedSet</default>
<documentation>
The default collection interface, this is the interface used with association end
accessors and mutators if the
@@ -982,6 +1000,32 @@
Used to define the default mapping for EJB3 collections.
</documentation>
</property>
+ <property name="associationEndCollectionIndexName" required="false">
+ <documentation>
+ The default association end collection index name
+ (this can be overridden by the
+ <a href="profile.html#@andromda_persistence_collection_index">@andromda.persistence.collection.index</a>).
+ </documentation>
+ </property>
+ <property name="associationEndCollectionIndexType" required="false">
+ <default>datatype::String</default>
+ <documentation>
+ The default association end collection index type
+ (this can be overridden by the
+ <a href="profile.html#@andromda_persistence_collection_index_type">@andromda.persistence.collection.index.type</a>
+ (this is applicable when the collection is a map).
+ </documentation>
+ </property>
+ <property name="ejb3TypeMappingsUri" required="false">
+ <default>Hibernate</default>
+ <documentation>
+ URI specifying the specific mappings from model types to ejb3/hibernate types.
+ (i.e. <code>file:${basedir}/HibernateTypeMappings.xml</code>). This
+ is not necessary but useful for defining hibernate user types (when
+ hibernate doesn't support a specific type in the manner needed
+ for your application).
+ </documentation>
+ </property>
<property name="compositionDefinesEagerLoading">
<default>true</default>
<documentation>
1.31 +22 -0 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/profile.xml
Index: profile.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/profile.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -r1.30 -r1.31
--- profile.xml 14 Jun 2006 04:55:21 -0000 1.30
+++ profile.xml 26 Jun 2006 06:56:51 -0000 1.31
@@ -915,6 +915,28 @@
<value>list</value>
</allowedValues>
</element>
+ <element name="ASSOCIATION_INDEX">
+ <documentation>
+ Column containing the collection index, overrides the
+ <a href="namespace.html#associationEndCollectionIndexName">associationEndCollectionIndexName</a>
+ </documentation>
+ <value>@andromda.persistence.collection.index</value>
+ <appliedOnElement>Association ends between <![CDATA[<<Entity>>]]> classes</appliedOnElement>
+ <allowedValues>
+ <value>A property of this entity</value>
+ </allowedValues>
+ </element>
+ <element name="ASSOCIATION_INDEX_TYPE">
+ <documentation>
+ The type of the column containing the collection index, overrides the
+ <a href="namespace.html#associationEndCollectionIndexType">associationEndCollectionIndexType</a>
+ </documentation>
+ <value>@andromda.persistence.collection.index.type</value>
+ <appliedOnElement>Association ends between <![CDATA[<<Entity>>]]> classes</appliedOnElement>
+ <allowedValues>
+ <value>A property of this entity</value>
+ </allowedValues>
+ </element>
<element name="LOB_TYPE">
<documentation>
Override the entity attribute type where
|
|
From: Vance K. <va...@us...> - 2006-06-26 06:55:09
|
User: vancek
Date: 06/06/25 23:55:08
Modified: andromda-ejb3 pom.xml
Log:
set java compiler to use v 1.5
Revision Changes Path
1.6 +8 -0 cartridges/andromda-ejb3/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/pom.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- pom.xml 29 May 2006 01:49:31 -0000 1.5
+++ pom.xml 26 Jun 2006 06:55:08 -0000 1.6
@@ -41,6 +41,14 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.andromda.maven.plugins</groupId>
<artifactId>andromda-maven-plugin</artifactId>
<dependencies>
|
|
From: Vance K. <va...@us...> - 2006-06-26 06:53:35
|
User: vancek
Date: 06/06/25 23:53:33
Modified: andromda-ejb3/src/site/xdoc howto.xml howto16.xml
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3ManageableEntityFacadeLogicImpl.java
EJB3ManageableEntityAttributeFacadeLogicImpl.java
EJB3ManageableEntityAssociationEndFacadeLogicImpl.java
EJB3AssociationEndFacadeLogicImpl.java
EJB3EntityAttributeFacadeLogicImpl.java
andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3
EJB3Profile.java EJB3Globals.java
andromda-ejb3/src/changes changes.xml
andromda-ejb3/src/main/uml EJB3MetafacadeModel.xml.zip
Log:
EJB3ManageableEntityAssociationEndFacade extends EJB3AssociationEndFacade and EJB3ManageableEntityAttributeFacade extends EJB3EntityAttributeFacade - refactor to remove method duplication
fix isRequired in EJB3AssociationEndFacade and EJB3EntityAttributeFacade to exclude property if entity has a generalization to a mapped superclass
add support for default list, set and map types for collection association ends
added ability to set association end collection index name and type for map index
set default collection interface for association ends java.util.SortedSet from java.util.Collection
Revision Changes Path
1.20 +5 -1 cartridges/andromda-ejb3/src/site/xdoc/howto.xml
Index: howto.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- howto.xml 29 May 2006 06:39:00 -0000 1.19
+++ howto.xml 26 Jun 2006 06:53:32 -0000 1.20
@@ -213,7 +213,11 @@
</p>
</li>
<li>
- <p><a href="howto16.html">Manageable Entities</a></p>
+ <p>
+ <a href="howto16.html">Manageable Entities</a></p>
+ <ul>
+ <li><p><a href="howto16.html#Manageable_Entities_Tips">Tips</a></p></li>
+ </ul>
</li>
<li>
<p>
1.5 +9 -0 cartridges/andromda-ejb3/src/site/xdoc/howto16.xml
Index: howto16.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/howto16.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- howto16.xml 29 May 2006 01:53:36 -0000 1.4
+++ howto16.xml 26 Jun 2006 06:53:32 -0000 1.5
@@ -99,6 +99,15 @@
<a href="http://galaxy.andromda.org/docs/andromda-cartridges/manageable-entities/index.html">
manageable entities</a> for AndroMDA.
</p>
+ <a name="Manageable_Entities_Tips"/>
+ <subsection name="Tips">
+ <p>
+ You should assign one attribute of every manageable entity as a unique index. This is
+ achieved by modelling the <![CDATA[<<Unique>>]]> stereotype on the attribute. As a result, it
+ will display the unique attribute value for foreign key reference columns when listing entities,
+ rather than the complete target entity property name-value pairs.
+ </p>
+ </subsection>
</section>
<section name="Next">
<p>
1.4 +7 -1 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.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- EJB3ManageableEntityFacadeLogicImpl.java 24 Apr 2006 02:55:36 -0000 1.3
+++ EJB3ManageableEntityFacadeLogicImpl.java 26 Jun 2006 06:53:32 -0000 1.4
@@ -1,15 +1,22 @@
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.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;
@@ -278,5 +285,4 @@
return displayAttribute;
}
-
}
\ No newline at end of file
1.3 +4 -3 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EJB3ManageableEntityAttributeFacadeLogicImpl.java 17 Feb 2006 02:38:22 -0000 1.2
+++ EJB3ManageableEntityAttributeFacadeLogicImpl.java 26 Jun 2006 06:53:32 -0000 1.3
@@ -24,11 +24,12 @@
}
/**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityAttributeFacadeLogic#handleGetTemporalType()
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityAttributeFacadeLogic#getTemporalType()
*/
- protected String handleGetTemporalType()
+ @Override
+ public String getTemporalType()
{
- String temporalType = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_TEMPORAL_TYPE);
+ String temporalType = super.getTemporalType();
if (StringUtils.isBlank(temporalType))
{
temporalType = String.valueOf(this.getConfiguredProperty(ENTITY_DEFAULT_TEMPORAL_TYPE));
1.3 +5 -31 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.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- EJB3ManageableEntityAssociationEndFacadeLogicImpl.java 20 Feb 2006 05:21:15 -0000 1.2
+++ EJB3ManageableEntityAssociationEndFacadeLogicImpl.java 26 Jun 2006 06:53:32 -0000 1.3
@@ -3,7 +3,12 @@
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;
@@ -15,39 +20,8 @@
public class EJB3ManageableEntityAssociationEndFacadeLogicImpl
extends EJB3ManageableEntityAssociationEndFacadeLogic
{
-
public EJB3ManageableEntityAssociationEndFacadeLogicImpl (Object metaObject, String context)
{
super (metaObject, context);
}
-
- /**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityAssociationEndFacadeLogic#handleGetLabelName()
- */
- protected String handleGetLabelName()
- {
- String labelNamePattern = (this.isMany() ?
- (String)this.getConfiguredProperty(EJB3Globals.LABEL_COLLECTION_NAME_PATTERN) :
- (String)this.getConfiguredProperty(EJB3Globals.LABEL_SINGLE_NAME_PATTERN));
-
- return MessageFormat.format(
- labelNamePattern,
- new Object[] {StringUtils.trimToEmpty(this.getName())});
- }
-
- /**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityAssociationEndFacadeLogic#handleGetGetterLabelName()
- */
- protected String handleGetGetterLabelName()
- {
- return UMLMetafacadeUtils.getGetterPrefix(this.getType()) + StringUtils.capitalize(this.getLabelName());
- }
-
- /**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityAssociationEndFacadeLogic#handleGetSetterLabelName()
- */
- protected String handleGetSetterLabelName()
- {
- return "set" + StringUtils.capitalize(this.getLabelName());
- }
}
\ No newline at end of file
1.10 +184 -10 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationEndFacadeLogicImpl.java
Index: EJB3AssociationEndFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3AssociationEndFacadeLogicImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- EJB3AssociationEndFacadeLogicImpl.java 29 May 2006 01:37:57 -0000 1.9
+++ EJB3AssociationEndFacadeLogicImpl.java 26 Jun 2006 06:53:32 -0000 1.10
@@ -35,17 +35,17 @@
/**
* The default composite association cascade property
*/
- public static final String ENTITY_DEFAULT_COMPOSITE_CASCADE = "entityCompositeCascade";
+ private static final String ENTITY_DEFAULT_COMPOSITE_CASCADE = "entityCompositeCascade";
/**
* The default aggregation association cascade property
*/
- public static final String ENTITY_DEFAULT_AGGREGATION_CASCADE = "entityAggergationCascade";
+ private static final String ENTITY_DEFAULT_AGGREGATION_CASCADE = "entityAggergationCascade";
/**
* The namespace property storing default collection type for associations
*/
- public static final String ASSOCIATION_COLLECTION_TYPE = "associationCollectionType";
+ private static final String ASSOCIATION_COLLECTION_TYPE = "associationCollectionType";
/**
* A flag indicating whether or not specific (java.util.Set, java.util.List,
@@ -53,14 +53,24 @@
* accessors or whether the generic java.util.Collection interface should be
* used.
*/
- public static final String SPECIFIC_COLLECTION_INTERFACES = "specificCollectionInterfaces";
+ private static final String SPECIFIC_COLLECTION_INTERFACES = "specificCollectionInterfaces";
/**
* The property that defines the default collection interface, this is the
* interface used if the property defined by
- * {@link #SPECIFIC_COLLECTION_INTERFACES} is true.
+ * {@link #SPECIFIC_COLLECTION_INTERFACES} is false.
*/
- public static final String DEFAULT_COLLECTION_INTERFACE = "defaultCollectionInterface";
+ private static final String DEFAULT_COLLECTION_INTERFACE = "defaultCollectionInterface";
+
+ /**
+ * Stores the default collection index name.
+ */
+ private static final String COLLECTION_INDEX_NAME = "associationEndCollectionIndexName";
+
+ /**
+ * Stores the default collection index type.
+ */
+ private static final String COLLECTION_INDEX_TYPE = "associationEndCollectionIndexType";
/**
* Represents the EJB3 <code>ALL</code> cascade option and fully qualified representation.
@@ -160,6 +170,21 @@
*/
private static final String HIBERNATE_ASSOCIATION_CACHE = "hibernateAssociationCache";
+ /**
+ * The 'list' type implementation to use.
+ */
+ private static final String LIST_TYPE_IMPLEMENTATION = "listTypeImplementation";
+
+ /**
+ * The 'set' type implementation to use.
+ */
+ private static final String SET_TYPE_IMPLEMENTATION = "setTypeImplementation";
+
+ /**
+ * The 'map' type implementation to use.
+ */
+ private static final String MAP_TYPE_IMPLEMENTATION = "mapTypeImplementation";
+
// ---------------- constructor -------------------------------
public EJB3AssociationEndFacadeLogicImpl (Object metaObject, String context)
@@ -173,6 +198,7 @@
/**
* @see org.andromda.metafacades.uml.AssociationEndFacade#getGetterSetterTypeName()
*/
+ @Override
public String getGetterSetterTypeName()
{
String getterSetterTypeName = null;
@@ -203,13 +229,12 @@
}
else
{
- getterSetterTypeName =
- ObjectUtils.toString(this.getConfiguredProperty(DEFAULT_COLLECTION_INTERFACE));
+ getterSetterTypeName = this.getDefaultCollectionInterface();
}
}
else
{
- getterSetterTypeName = ObjectUtils.toString(this.getConfiguredProperty(DEFAULT_COLLECTION_INTERFACE));
+ getterSetterTypeName = this.getDefaultCollectionInterface();
}
}
else
@@ -256,7 +281,11 @@
{
EJB3EntityFacade entity = (EJB3EntityFacade)type;
- if (entity.isInheritanceSingleTable() && (entity.getGeneralization() != null))
+ /**
+ * Excluse ONLY if single table inheritance exists
+ */
+ if (entity.isRequiresGeneralizationMapping() && entity.isInheritanceSingleTable()
+ && !entity.isEmbeddableSuperclassGeneralizationExists())
{
required = false;
}
@@ -553,6 +582,60 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#handleGetCollectionTypeImplementation()
+ */
+ protected String handleGetCollectionTypeImplementation()
+ {
+ return this.getCollectionTypeImplementation(null);
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#handleGetCollectionTypeImplementation(java.lang.String)
+ */
+ protected String handleGetCollectionTypeImplementation(String arg)
+ {
+ StringBuffer implementation = new StringBuffer();
+ if (this.isMany())
+ {
+ implementation.append("new ");
+ if (this.isSet())
+ {
+ implementation.append(this.getConfiguredProperty(SET_TYPE_IMPLEMENTATION));
+ }
+ else if (this.isMap())
+ {
+ implementation.append(this.getConfiguredProperty(MAP_TYPE_IMPLEMENTATION));
+ }
+ else if (this.isList() || this.isCollection())
+ {
+ implementation.append(this.getConfiguredProperty(LIST_TYPE_IMPLEMENTATION));
+ }
+
+ // set this association end's type as a template parameter if required
+ if (Boolean.valueOf(String.valueOf(this.getConfiguredProperty(UMLMetafacadeProperties.ENABLE_TEMPLATING)))
+ .booleanValue())
+ {
+ implementation.append("<");
+ if (this.isMap())
+ {
+ implementation.append(this.getCollectionIndexType());
+ implementation.append(", ");
+ }
+ implementation.append(this.getType().getFullyQualifiedName());
+ implementation.append(">");
+ }
+ implementation.append("(");
+ if (StringUtils.isNotBlank(arg))
+ {
+ implementation.append(arg);
+ }
+ implementation.append(")");
+ }
+
+ return implementation.toString();
+ }
+
+ /**
* Gets the collection type defined on this association end.
*
* @return the specific collection type.
@@ -564,6 +647,63 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#handleGetCollectionIndexType()
+ */
+ protected String handleGetCollectionIndexType()
+ {
+ Object value = this.findTaggedValue(EJB3Profile.TAGGEDVALUE_ASSOCIATION_INDEX_TYPE);
+ if (value == null)
+ {
+ value = this.getConfiguredProperty(COLLECTION_INDEX_TYPE);
+ if (StringUtils.isBlank(ObjectUtils.toString(value)))
+ {
+ value = null;
+ }
+ }
+
+ if (value != null)
+ {
+ if (value instanceof String)
+ {
+ value = this.getRootPackage().findModelElement((String)value);
+ }
+ if (value instanceof EJB3TypeFacade)
+ {
+ value = ((EJB3TypeFacade)value).getFullyQualifiedEJB3Type();
+ }
+ }
+ return (value != null) ? ObjectUtils.toString(value) : null;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#handleGetCollectionIndexName()
+ */
+ protected String handleGetCollectionIndexName()
+ {
+ Object value = this.findTaggedValue(EJB3Profile.TAGGEDVALUE_ASSOCIATION_INDEX);
+ if ((value == null) && this.isConfiguredProperty(COLLECTION_INDEX_NAME))
+ {
+ value = this.getConfiguredProperty(COLLECTION_INDEX_NAME);
+ if (StringUtils.isBlank(ObjectUtils.toString(value)))
+ {
+ value = null;
+ }
+ }
+
+ if (value != null)
+ {
+ return ObjectUtils.toString(value);
+ }
+ final String otherEntityName = ((EJB3EntityFacade)this.getOtherEnd().getType()).getEntityName();
+ final Object separator = this.getConfiguredProperty(UMLMetafacadeProperties.SQL_NAME_SEPARATOR);
+ return EntityMetafacadeUtils.toSqlName(
+ otherEntityName,
+ separator) + separator + EntityMetafacadeUtils.toSqlName(
+ this.getName(),
+ separator) + separator + "IDX";
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#handleIsMap()
*/
protected boolean handleIsMap()
@@ -603,6 +743,19 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#handleIsCollection()
+ */
+ protected boolean handleIsCollection()
+ {
+ boolean isCollection = this.getCollectionType().equalsIgnoreCase(COLLECTION_TYPE_COLLECTION);
+ if (!isCollection && StringUtils.isBlank(this.getSpecificCollectionType()))
+ {
+ isCollection = this.isOrdered();
+ }
+ return isCollection;
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#handleGetLabelName()
*/
protected String handleGetLabelName()
@@ -718,4 +871,25 @@
buffer.append(constraintSuffix);
return buffer.toString();
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#handleGetDefaultCollectionInterface()
+ */
+ protected String handleGetDefaultCollectionInterface()
+ {
+ return ObjectUtils.toString(this.getConfiguredProperty(DEFAULT_COLLECTION_INTERFACE));
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogic#handleIsDefaultCollectionInterfaceSortedSet()
+ */
+ protected boolean handleIsDefaultCollectionInterfaceSortedSet()
+ {
+ boolean isDefaultSortedSet = false;
+ if (StringUtils.equals(this.getDefaultCollectionInterface(), EJB3Globals.COLLECTION_INTERFACE_SORTED_SET))
+ {
+ isDefaultSortedSet = true;
+ }
+ return isDefaultSortedSet;
+ }
}
\ No newline at end of file
1.14 +11 -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.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- EJB3EntityAttributeFacadeLogicImpl.java 24 Apr 2006 02:47:36 -0000 1.13
+++ EJB3EntityAttributeFacadeLogicImpl.java 26 Jun 2006 06:53:32 -0000 1.14
@@ -52,6 +52,7 @@
/**
* @see org.andromda.metafacades.uml.AttributeFacade#getGetterName()
*/
+ @Override
public String getGetterName()
{
return "get" + StringUtils.capitalize(super.getName());
@@ -62,13 +63,19 @@
*
* @see org.andromda.metafacades.uml.AttributeFacade#isRequired()
*/
+ @Override
public boolean isRequired()
{
boolean required = super.isRequired();
if (this.getOwner() instanceof EJB3EntityFacade)
{
EJB3EntityFacade entity = (EJB3EntityFacade)this.getOwner();
- if (entity.isInheritanceSingleTable() && entity.getGeneralization() != null)
+
+ /**
+ * Excluse ONLY if single table inheritance exists
+ */
+ if (entity.isRequiresGeneralizationMapping() && entity.isInheritanceSingleTable()
+ && !entity.isEmbeddableSuperclassGeneralizationExists())
{
required = false;
}
@@ -81,6 +88,7 @@
*
* @see org.andromda.metafacades.uml.AttributeFacade#getDefaultValue()
*/
+ @Override
public String getDefaultValue()
{
String defaultValue = super.getDefaultValue();
@@ -359,6 +367,7 @@
*
* @see org.andromda.metafacades.uml.EntityAttribute#getColumnLength()
*/
+ @Override
public String getColumnLength()
{
String columnLength = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_COLUMN_LENGTH);
@@ -375,6 +384,7 @@
*
* @see org.andromda.metafacades.uml.EntityAttribute#getColumnName()
*/
+ @Override
public String getColumnName()
{
String columnName = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_COLUMN);
1.26 +10 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Profile.java
Index: EJB3Profile.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Profile.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- EJB3Profile.java 14 Jun 2006 04:56:57 -0000 1.25
+++ EJB3Profile.java 26 Jun 2006 06:53:32 -0000 1.26
@@ -512,6 +512,16 @@
public static final String TAGGEDVALUE_ASSOCIATION_COLLECTION_TYPE = profile.get("ASSOCIATION_COLLECTION_TYPE");
/**
+ * Defines the index column type for ejb3 indexed collections
+ */
+ public static final String TAGGEDVALUE_ASSOCIATION_INDEX_TYPE = profile.get("ASSOCIATION_INDEX_TYPE");
+
+ /**
+ * Defines the index column for ejb3 indexed collections
+ */
+ public static final String TAGGEDVALUE_ASSOCIATION_INDEX = profile.get("ASSOCIATION_INDEX");
+
+ /**
* Defines whether to exclude the default interceptors for the session operation.
*/
public static final String TAGGEDVALUE_SERVICE_INTERCEPTOR_EXCLUDE_DEFAULT =
1.13 +5 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Globals.java
Index: EJB3Globals.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/EJB3Globals.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- EJB3Globals.java 14 Jun 2006 04:56:57 -0000 1.12
+++ EJB3Globals.java 26 Jun 2006 06:53:32 -0000 1.13
@@ -256,4 +256,9 @@
* Seam component scope type CONVERSATION
*/
public static final String SEAM_COMPONENT_SCOPE_CONVERSATION = "CONVERSATION";
+
+ /**
+ * The property representing the default collection interface of java.util.SortedSet
+ */
+ public static final String COLLECTION_INTERFACE_SORTED_SET = "java.util.SortedSet";
}
1.9 +61 -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.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- changes.xml 17 Jun 2006 12:02:21 -0000 1.8
+++ changes.xml 26 Jun 2006 06:53:33 -0000 1.9
@@ -108,6 +108,67 @@
<action dev="vancek" type="add">
Added FAQ support section menu to site.
</action>
+ <action dev="vancek" type="fix">
+ Remove references to attributes modelled with a @Version annotation (optimistic lock value for entity) in
+ manageable service components. Initial work removed attribute from getAttributes, but that caused problems
+ from the manageable web tier action methods create and update. To account for this, allow the attribute as
+ arguement to the methods, but do not call the set accessor.
+ </action>
+ <action dev="vancek" type="fix">
+ Moved the @Version annotation to the entity attribute. It had no effect on the getter method.
+ Removed all annotations on the corresponding getter method.
+ </action>
+ <action dev="vancek" type="update">
+ Render the @Table annotation on every entity to avoid application server detting the default table name
+ mapped to by this entity. Currently, the annotation is only rendered when there is an inheritence hierarchy
+ or a mapped superclass.
+ </action>
+ <action dev="vancek" type="update">
+ Update the default Collection for one-to-many and many-to-many associations to the java.util.SortedSet (in
+ namespace.xml).
+ Moving away from bag collection as the default since it is unnecessary in the majority of cases.
+ As a result, the @org.hibernate.annotations.Sort annotation is also rendered with a NATURAL sort type.
+ The create and update methods of the manageable service implementation wraps the retrieved bag collection(List)
+ for the 'many' side of the association with an appropriate collection implementation (unless java.util.List
+ is specified as the default).
+ </action>
+ <action dev="vancek" type="fix">
+ Ignore the argument on create and update methods of DAO implementation components where the corresponding
+ entity attribute is modelled as an optimistic lock value with the Version stereotype. This should be improved
+ to eliminate the attribute when retrieving the attribute collection.
+ </action>
+ <action dev="vancek" type="update">
+ Each finder is overloaded in the DAO components. One finder method that doesn't supply a manual query
+ argument should use the NamedQuery defined on the corresponding entity. Currently, it generates the query.
+ </action>
+ <action dev="vancek" type="fix">
+ Minor fixes to the EJBQL of the finder methods in the manageable service base for manageable entities.
+ </action>
+ <action dev="vancek" type="fix">
+ In the findAll method of the manageable service base implementation, the query now includes 'left join fetch'
+ for all related 'many' association ends where the target entity does not define a display attribute (where
+ the attribute is modelled with the Unique stereotype).
+ </action>
+ <action dev="vancek" type="update">
+ Updated the metafacade definitions of EJB3AssociationEndFacadeLogicImpl, EJB3AssociationEndFacadeLogicImpl
+ and EJB3MessageDrivenOperationFacadeLogicImpl in metafacade.xml.
+ </action>
+ <action dev="vancek" type="add">
+ Added support for default list, set and map type implementations for collection association ends in
+ namespace.xml. Also added the ability
+ for association end collection index name and type (further map support) to be specified via tagged values
+ @andromda.persistence.collection.index and @andromda.persistence.collection.index.type. This introduced
+ a new facade called EJB3TypeFacade.
+ </action>
+ <action dev="vancek" type="fix">
+ Fixed isRequired in EJB3AssociationEndFacade and EJB3EntityAttributeFacade to exclude property if
+ the entity has a generalization to an mapped superclass.
+ </action>
+ <action dev="vancek" type="update">
+ EJB3ManageableEntityAssociationEndFacade now also extends EJB3AssociationEndFacade with precedence tagged value
+ set. EJB3ManageableEntityAttributeFacade also extends EJB3EntityAttributeFacade. This eliminates the
+ need for the existing overwritten methods in the manageable entity facades.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.41 +203 -212 cartridges/andromda-ejb3/src/main/uml/EJB3MetafacadeModel.xml.zip
<<Binary file>>
|
|
From: Vance K. <va...@us...> - 2006-06-26 06:46:43
|
User: vancek
Date: 06/06/25 23:46:42
Added: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3TypeFacadeLogicImpl.java
Log:
initial revision - type mapping
Revision Changes Path
1.1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3TypeFacadeLogicImpl.java
Index: EJB3TypeFacadeLogicImpl.java
===================================================================
package org.andromda.cartridges.ejb3.metafacades;
import org.andromda.core.common.ExceptionRecorder;
import org.andromda.metafacades.uml.TypeMappings;
import org.apache.commons.lang.StringUtils;
/**
* MetafacadeLogic implementation for org.andromda.cartridges.ejb3.metafacades.EJB3TypeFacade.
*
* @see org.andromda.cartridges.ejb3.metafacades.EJB3TypeFacade
*/
public class EJB3TypeFacadeLogicImpl
extends EJB3TypeFacadeLogic
{
public EJB3TypeFacadeLogicImpl (Object metaObject, String context)
{
super (metaObject, context);
}
/**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3TypeFacade#getFullyQualifiedEJB3Type()
*/
protected java.lang.String handleGetFullyQualifiedEJB3Type()
{
String fullyQualifiedName = super.getFullyQualifiedName();
final TypeMappings mappings = this.getEJB3TypeMappings();
if (mappings != null)
{
final String fullyQualifiedModelName = super.getFullyQualifiedName(true);
if (mappings.getMappings().containsFrom(fullyQualifiedModelName))
{
fullyQualifiedName = mappings.getTo(fullyQualifiedModelName);
}
}
return fullyQualifiedName;
}
/**
* Gets the <code>hibernateTypeMappings</code> for this ejb3/hibernate type.
*
* @return the hibernate type TypeMappings.
*/
protected TypeMappings getEJB3TypeMappings()
{
TypeMappings mappings = null;
final String propertyName = "ejb3TypeMappingsUri";
if (this.isConfiguredProperty(propertyName))
{
final Object property = this.getConfiguredProperty(propertyName);
String uri = null;
if (property instanceof String)
{
uri = (String)property;
if (StringUtils.isNotBlank(uri))
{
try
{
mappings = TypeMappings.getInstance((String)property);
this.setProperty(propertyName, mappings);
}
catch (final Throwable throwable)
{
final String message = "Error getting '" + propertyName + "' --> '" + uri + "'";
logger.error(message);
// don't throw the exception
ExceptionRecorder.instance().record(message, throwable);
}
}
}
else
{
mappings = (TypeMappings)property;
}
}
return mappings;
}
}
|
|
From: Vance K. <va...@us...> - 2006-06-26 06:46:08
|
User: vancek
Date: 06/06/25 23:46:07
Modified: andromda-ejb3/src/main/resources/META-INF/andromda
metafacades.xml
Log:
update metafacade definitions EJB3AssociationEndFacade, EJB3AssociationEndFacade and EJB3MessageDrivenOperationFacade
Revision Changes Path
1.24 +36 -31 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/metafacades.xml
Index: metafacades.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/metafacades.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- metafacades.xml 30 Apr 2006 01:51:11 -0000 1.23
+++ metafacades.xml 26 Jun 2006 06:46:07 -0000 1.24
@@ -108,30 +108,6 @@
</mapping>
<property reference="implementationOperationNamePattern"/>
</metafacade>
- <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3FinderMethodFacadeLogicImpl" contextRoot="true">
- <mapping>
- <stereotype>FINDER_METHOD</stereotype>
- <context>
- org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade
- </context>
- </mapping>
- <property reference="queryUseNamedParameters"/>
- </metafacade>
- <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3FinderMethodFacadeLogicImpl" contextRoot="true">
- <mapping>
- <context>
- org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade
- </context>
- <property name="query"/>
- </mapping>
- </metafacade>
- <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3FinderMethodArgumentFacadeLogicImpl">
- <mapping>
- <context>
- org.andromda.cartridges.ejb3.metafacades.EJB3FinderMethodFacade
- </context>
- </mapping>
- </metafacade>
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogicImpl" contextRoot="true">
<mapping>
<stereotype>ENTITY</stereotype>
@@ -140,9 +116,7 @@
</metafacade>
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3AssociationEndFacadeLogicImpl">
<mapping>
- <context>
- org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade
- </context>
+ <property name="type.eJB3EntityFacadeMetaType"/>
</mapping>
<property reference="entityCompositeCascade"/>
<property reference="entityAggergationCascade"/>
@@ -151,12 +125,15 @@
<property reference="defaultCollectionInterface"/>
<property reference="hibernateEnableAssociationsCache"/>
<property reference="hibernateAssociationCache"/>
+ <property reference="listTypeImplementation"/>
+ <property reference="setTypeImplementation"/>
+ <property reference="mapTypeImplementation"/>
+ <property reference="associationEndCollectionIndexName"/>
+ <property reference="associationEndCollectionIndexType"/>
</metafacade>
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3AssociationFacadeLogicImpl">
<mapping>
- <context>
- org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade
- </context>
+ <property name="associationEndA.eJB3AssociationEndFacadeMetaType"/>
</mapping>
</metafacade>
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3EntityAttributeFacadeLogicImpl">
@@ -169,6 +146,31 @@
<property reference="entityDefaultGeneratorInitialValue"/>
<property reference="entityDefaultGeneratorAllocationSize"/>
</metafacade>
+ <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3FinderMethodFacadeLogicImpl" contextRoot="true">
+ <mapping>
+ <stereotype>FINDER_METHOD</stereotype>
+ <context>
+ org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade
+ </context>
+ </mapping>
+ <property reference="queryUseNamedParameters"/>
+ </metafacade>
+ <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3FinderMethodFacadeLogicImpl" contextRoot="true">
+ <mapping>
+ <context>
+ org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade
+ </context>
+ <property name="query"/>
+ </mapping>
+ <property reference="queryUseNamedParameters"/>
+ </metafacade>
+ <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3FinderMethodArgumentFacadeLogicImpl">
+ <mapping>
+ <context>
+ org.andromda.cartridges.ejb3.metafacades.EJB3FinderMethodFacade
+ </context>
+ </mapping>
+ </metafacade>
<!-- Session EJB Metafacades -->
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogicImpl" contextRoot="true">
@@ -202,7 +204,7 @@
</metafacade>
<metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3MessageDrivenOperationFacadeLogicImpl">
<mapping>
- <property name="eJB3MessageDrivenFacadeMetaType"/>
+ <property name="owner.eJB3MessageDrivenFacadeMetaType"/>
</mapping>
</metafacade>
@@ -235,4 +237,7 @@
<context>org.andromda.cartridges.ejb3.metafacades.EJB3EmbeddedValueFacade</context>
</mapping>
</metafacade>
+ <metafacade class="org.andromda.cartridges.ejb3.metafacades.EJB3TypeFacadeLogicImpl">
+ <property reference="ejb3TypeMappingsUri"/>
+ </metafacade>
</metafacades>
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-06-26 06:45:14
|
User: vancek
Date: 06/06/25 23:45:12
Modified: andromda-ejb3/src/main/resources/templates/ejb3/crud
ManageableServiceRemote.vsl
ManageableServiceBase.vsl
andromda-ejb3/src/main/resources/templates/ejb3 DaoBase.vsl
Log:
ignore attributes with @Version modelled in args for create/update
accomodate SortedSet as the default collection interface for one-to-many and many-to-many
the dao finder method without a query arg uses NamedQuery rather than generate EJBQL
fix EJBQL in manageable service findAll - account for collection association end
Revision Changes Path
1.3 +4 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/crud/ManageableServiceRemote.vsl
Index: ManageableServiceRemote.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/crud/ManageableServiceRemote.vsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ManageableServiceRemote.vsl 17 Feb 2006 02:32:44 -0000 1.2
+++ ManageableServiceRemote.vsl 26 Jun 2006 06:45:12 -0000 1.3
@@ -1,5 +1,8 @@
// license-header java merge-point
-/** Autogenerated by AndroMDA (ManageableServiceRemote.vsl) - do not edit */
+//
+// Attention: Generated code! Do not modify by hand!
+// Generated by: ManageableServiceRemote.vsl in andromda-ejb3-cartridge.
+//
#set ($generatedFile = "${manageable.manageableServiceFullPath}.java")
#set ($memberList = $manageable.listManageableMembers(true))
#if (!$manageable.identifiers.empty)
1.5 +60 -24 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/crud/ManageableServiceBase.vsl
Index: ManageableServiceBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/crud/ManageableServiceBase.vsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- ManageableServiceBase.vsl 24 Apr 2006 02:36:16 -0000 1.4
+++ ManageableServiceBase.vsl 26 Jun 2006 06:45:12 -0000 1.5
@@ -1,5 +1,8 @@
// license-header java merge-point
-/* Autogenerated by AndroMDA (ManageableServiceBase.vsl) - do not edit */
+//
+// Attention: Generated code! Do not modify by hand!
+// Generated by: ManageableServiceBase.vsl in andromda-ejb3-cartridge.
+//
#set ($generatedFile = "${manageable.manageableServiceBaseFullPath}.java")
#set ($memberList = $manageable.listManageableMembers(true))
#set ($memberListArguments = $manageable.listManageableMembers(false))
@@ -39,9 +42,9 @@
@javax.persistence.PersistenceContext#if ($manageable.defaultPersistenceContextUnitName)(unitName = "${manageable.defaultPersistenceContextUnitName}")#end
protected javax.persistence.EntityManager emanager;
+
#set ($associatedClasses = $manageable.allAssociatedClasses)
#if (!$associatedClasses.empty)
-
// ------------ Private Operations ----------
#**##foreach ($associatedClass in $associatedClasses)
@@ -50,7 +53,7 @@
{
try
{
- javax.persistence.Query query = emanager.createQuery("from ${associatedClass.entityName} as entity where entity.${associatedClass.manageableIdentifierWorkaround.name} in (:${associatedClass.manageableIdentifierWorkaround.name})");
+ javax.persistence.Query query = emanager.createQuery("select entity from ${associatedClass.entityName} as entity where entity.${associatedClass.manageableIdentifierWorkaround.name} in (:${associatedClass.manageableIdentifierWorkaround.name})");
query.setParameter("${associatedClass.manageableIdentifierWorkaround.name}", java.util.Arrays.asList(ids));
return query.getResultList();
}
@@ -62,7 +65,6 @@
#**##end
#end
-
// ------------ CRUD Operations -------------
#if ($manageable.create)
@@ -87,15 +89,21 @@
#**##end
final ${manageable.fullyQualifiedName} entity = new ${manageable.fullyQualifiedName}();
#**##foreach ($member in $manageable.manageableAttributes)
+##
+## Ignore arg where the corresponding entity attribute is modelled as a version
+##
+#* *##if (!$member.version)
entity.${member.setterName}($member.name);
#**##end
+#**##end
try
{
#**##foreach ($member in $manageable.manageableAssociationEnds)
#* *##if ($member.many)
#* *##set ($memberEntityName = "${member.name}Entities")
- final java.util.List<${member.type.fullyQualifiedName}> $memberEntityName = ($member.name != null && ${member.name}.length > 0)
+ final java.util.List<${member.type.fullyQualifiedName}> $memberEntityName =
+ ($member.name != null && ${member.name}.length > 0)
? this.find${member.type.name}ByIds($member.name)
: java.util.Collections.EMPTY_LIST;
@@ -110,7 +118,11 @@
if ($memberEntityName != null)
{
+#* *##if ($member.many && !$member.list)
+ entity.${member.setterName}(${member.getCollectionTypeImplementation($memberEntityName)});
+#* *##else
entity.${member.setterName}($memberEntityName);
+#* *##end
#* *##if ($member.many2Many)
#* *##if ($member.otherEnd.navigable)
@@ -128,6 +140,7 @@
#* *##end
#* *##end
}
+
#**##end
emanager.persist(entity);
@@ -232,7 +245,6 @@
try
{
final javax.persistence.Query query = emanager.createQuery(buf.toString());
-
#**##foreach ($member in $manageable.manageableAttributes)
#* *##if ($member.type.primitive)
#* *##if ($member.type.fullyQualifiedName != 'boolean')
@@ -312,7 +324,19 @@
{
try
{
- javax.persistence.Query query = emanager.createQuery("from ${manageable.entityName} as entity");
+#set ($findAllQuery = "select entity from ${manageable.entityName} as entity")
+#foreach ($member in $manageable.manageableAssociationEnds)
+##
+## add left join fetch to query to retrieve many side of association ends
+## this is only required if the ends are not initialised further down
+##
+#**##if ($member.type.displayAttributeWorkaround.name == $member.type.manageableIdentifierWorkaround.name)
+#* *##if ($member.many)
+#* *##set ($findAllQuery = "${findAllQuery} left join fetch entity.${member.name}")
+#* *##end
+#**##end
+#end
+ javax.persistence.Query query = emanager.createQuery("${findAllQuery}");
#if ($manageable.maximumListSize > 0)
query.setMaxResults($manageable.maximumListSize);
#end
@@ -324,6 +348,8 @@
public Object transform(final Object object)
{
${manageable.fullyQualifiedEntityName} result = (${manageable.fullyQualifiedEntityName})object;
+ if (result.${member.getterName}() != null)
+ {
#* *##if ($member.many)
java.util.Collection<${member.type.displayAttributeWorkaround.type.fullyQualifiedName}> $member.labelName = java.util.Collections.synchronizedCollection(new java.util.ArrayList<${member.type.displayAttributeWorkaround.type.fullyQualifiedName}>());
for (final java.util.Iterator<${member.type.fullyQualifiedEntityName}> iterator = result.${member.getterName}().iterator(); iterator.hasNext();)
@@ -338,6 +364,7 @@
#* *##else
result.${member.setterName}#if ($member.many)Labels#else#**#Label#end(result.${member.getterName}().${member.type.displayAttributeWorkaround.getterName}());
#* *##end
+ }
return result;
}
});
@@ -437,7 +464,11 @@
#**##end
final $manageable.fullyQualifiedName entity = (${manageable.fullyQualifiedName})emanager.find(${manageable.fullyQualifiedName}.class, #if ($identifier.type.primitive)new ${identifier.type.wrapperName}($identifier.name)#else${identifier.name}#end);
#**##foreach ($member in $manageable.manageableAttributes)
-#* *##if (!$member.identifier)## the identifier is already present since we loaded the entity
+##
+## Ignore arg where the corresponding entity attribute is modelled as a version
+## The identifier is already present since we loaded the entity
+##
+#* *##if (!$member.identifier && !$member.version)
entity.${member.setterName}(${member.name});
#* *##end
#**##end
@@ -447,7 +478,8 @@
#**##foreach ($member in $manageable.manageableAssociationEnds)
#* *##if ($member.many)
#* *##set ($memberEntityName = "${member.name}Entities")
- final java.util.List<${member.type.fullyQualifiedName}> $memberEntityName = ($member.name != null && ${member.name}.length > 0)
+ final java.util.List<${member.type.fullyQualifiedName}> $memberEntityName =
+ ($member.name != null && ${member.name}.length > 0)
? this.find${member.type.name}ByIds($member.name)
: java.util.Collections.EMPTY_LIST;
@@ -462,7 +494,11 @@
if ($memberEntityName != null)
{
+#* *##if ($member.many && !$member.list)
+ entity.${member.setterName}(${member.getCollectionTypeImplementation($memberEntityName)});
+#* *##else
entity.${member.setterName}($memberEntityName);
+#* *##end
#* *##if ($member.many2Many)
#* *##if ($member.otherEnd.navigable)
// set the other ends of the many2many association too
1.8 +43 -46 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/DaoBase.vsl
Index: DaoBase.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/DaoBase.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- DaoBase.vsl 29 May 2006 01:40:14 -0000 1.7
+++ DaoBase.vsl 26 Jun 2006 06:45:12 -0000 1.8
@@ -265,16 +265,21 @@
{
$entity.fullyQualifiedEntityName entity = new ${entity.fullyQualifiedEntityName}();
#* *##foreach ($attribute in $attributes)
+#* *##if (!$attribute.version)
+##
+## Ignore arg where the corresponding entity attribute is modelled as a version
+##
entity.${attribute.setterName}($attribute.name);
#* *##end
+#* *##end
return this.create(transform, entity);
}
#* *##end
-#* *##set ($requiredProperties = $entity.getRequiredProperties(true,false))
-#* *##if (!$requiredProperties.empty && $entity.getRequiredAttributes(true,false).size() != $requiredProperties.size())
+#* *##set ($requiredProperties = $entity.getRequiredProperties(true,$entity.usingAssignedIdentifier))
+#* *##if (!$requiredProperties.empty && $entity.getRequiredAttributes(true,$entity.usingAssignedIdentifier).size() != $requiredProperties.size())
/**
- * @see ${entity.fullyQualifiedDaoName}#create(${entity.getRequiredPropertyTypeList(true, false)})
+ * @see ${entity.fullyQualifiedDaoName}#create(${entity.getRequiredPropertyTypeList(true, $entity.usingAssignedIdentifier)})
*/
public $rootEntityType create(
#* *##foreach($property in $requiredProperties)
@@ -283,11 +288,11 @@
#* *##end
{
- return ($rootEntityType)this.create($entity.daoNoTransformationConstantName, ${entity.getRequiredPropertyNameList(true,false)});
+ return ($rootEntityType)this.create($entity.daoNoTransformationConstantName, ${entity.getRequiredPropertyNameList(true,$entity.usingAssignedIdentifier)});
}
/**
- * @see ${entity.fullyQualifiedDaoName}#create(int, ${entity.getRequiredPropertyTypeList(true, false)})
+ * @see ${entity.fullyQualifiedDaoName}#create(int, ${entity.getRequiredPropertyTypeList(true, $entity.usingAssignedIdentifier)})
*/
public Object create(
final int transform,
@@ -493,7 +498,6 @@
throws ${entity.fullyQualifiedDaoDefaultExceptionName}
#**##end
{
-#**##if ($finder.namedQuery)
try
{
javax.persistence.Query queryObject = emanager.createNamedQuery("${entity.name}.${finder.name}");
@@ -554,13 +558,6 @@
{
throw new ${entity.fullyQualifiedDaoDefaultExceptionName}(ex);
}
-#**##else
-#* *##if ($finder.returnTypePresent)
- return this.${finder.name}(transform, "$finder.getQuery($entity)"#if(!$finder.arguments.empty), ${finder.argumentNames}#end);
-#* *##else
- this.${finder.name}(transform, "$finder.getQuery($entity)"#if(!$finder.arguments.empty), ${finder.argumentNames}#end);
-#* *##end
-#**##end
}
/**
|
|
From: Vance K. <va...@us...> - 2006-06-26 06:37:14
|
User: vancek
Date: 06/06/25 23:37:13
Modified: andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
Log:
moved @Version annotation from getter to attribute - all other annotation of the getter of a version attribute are disabled
render the @Table annotation for every suitable entity - not just those with inheritence
Revision Changes Path
1.33 +14 -5 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
Index: EntityEmbeddable.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -w -r1.32 -r1.33
--- EntityEmbeddable.vsl 17 Jun 2006 03:51:02 -0000 1.32
+++ EntityEmbeddable.vsl 26 Jun 2006 06:37:12 -0000 1.33
@@ -55,7 +55,7 @@
## If a class is manually specified as an embeddable superclass, add
## the Table annotation to the subclass, not to the base superclass.
##
-#**##if (!$entity.entityImplementationRequired && ($entity.requiresSpecializationMapping || ($entity.requiresGeneralizationMapping && ($entity.embeddableSuperclassGeneralizationExists || $entity.inheritanceTablePerClass || $entity.inheritanceJoined))))
+#**##if (!$entity.entityImplementationRequired && ($entity.requiresSpecializationMapping || !$entity.requiresGeneralizationMapping || ($entity.requiresGeneralizationMapping && ($entity.embeddableSuperclassGeneralizationExists || $entity.inheritanceTablePerClass || $entity.inheritanceJoined))))
@javax.persistence.Table(name = "${entity.tableName}")
#**##end
#**##if ($entity.listenerEnabled)
@@ -169,6 +169,12 @@
#* *##set ($doAttribute = true)
#* *##end
#* *##if ($doAttribute)
+#* *##if (!$attribute.transient && $attribute.version)
+##
+## Add the Version annotation on the attribute itself
+##
+ @javax.persistence.Version
+#* *##end
##
## Check for overriding LOB type
##
@@ -382,7 +388,7 @@
##
#* *##if ($attribute.transient)
@javax.persistence.Transient
-#* *##else
+#* *##elseif (!$attribute.version)
#* *##if ($attribute.identifier)
@javax.persistence.Id
#* *##if ($attribute.sequenceGeneratorType)
@@ -394,9 +400,6 @@
@javax.persistence.GeneratedValue(strategy = javax.persistence.GenerationType.${attribute.generatorType}#if ($attribute.sequenceGeneratorType || $attribute.tableGeneratorType), generator = "${attribute.generatorName}"#end)
#* *##end
#* *##end
-#* *##if ($attribute.version)
- @javax.persistence.Version
-#* *##end
#* *##if ($attribute.lob)
##
## Add if LOB type is specified - do not set LOB type as of PFD Spec - inferred from type.
@@ -559,6 +562,9 @@
#* *##if ($target.associationCacheEnabled)
@org.hibernate.annotations.Cache(usage = org.hibernate.annotations.CacheConcurrencyStrategy.${target.cacheType})
#* *##end
+#* *##if ($target.defaultCollectionInterfaceSortedSet)
+ @org.hibernate.annotations.Sort(type = org.hibernate.annotations.SortType.NATURAL)
+#* *##end
#* *##end
public $target.getterSetterTypeName ${target.getterName}()
{
@@ -674,6 +680,9 @@
#* *##if ($target.associationCacheEnabled)
@org.hibernate.annotations.Cache(usage = org.hibernate.annotations.CacheConcurrencyStrategy.${target.cacheType})
#* *##end
+#* *##if ($target.defaultCollectionInterfaceSortedSet)
+ @org.hibernate.annotations.Sort(type = org.hibernate.annotations.SortType.NATURAL)
+#* *##end
#* *##end
public $target.getterSetterTypeName ${target.getterName}()
{
|
|
From: Eric C. <ecr...@us...> - 2006-06-23 15:36:36
|
User: ecrutchfield Date: 06/06/23 08:36:34 Removed: maven2/plugins/andromdanetapp readme Log: renamed to readme.txt |
|
From: Eric C. <ecr...@us...> - 2006-06-23 15:35:42
|
User: ecrutchfield Date: 06/06/23 08:35:42 Added: maven2/plugins/andromdanetapp readme.txt Log: changed name and updated CVS URL Revision Changes Path 1.1 plugins/maven2/plugins/andromdanetapp/readme.txt Index: readme.txt =================================================================== This is the AndroMDA .NET Application Generator Maven Plugin and is the first of two pieces needed to generate .NET AndroMDA applications. Download and install this plugin as well as the csharp project (http://andromdaplugins.cvs.sourceforge.net/andromdaplugins/plugins/andromdapp/projects/csharp/maven2/) To install, download the source code from here http://andromdaplugins.cvs.sourceforge.net/andromdaplugins/plugins/maven2/plugins/andromdanetapp/ and type 'mvn install' at the command line. Then do the same for the csharp project. |
|
From: Eric C. <ecr...@us...> - 2006-06-22 20:42:10
|
User: ecrutchfield
Date: 06/06/22 13:42:09
Modified: andromda-cs/conf/test andromda.xml
Log:
now failing on validation errors
Revision Changes Path
1.2 +1 -1 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.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- andromda.xml 8 Mar 2006 04:10:59 -0000 1.1
+++ andromda.xml 22 Jun 2006 20:42:08 -0000 1.2
@@ -1,6 +1,6 @@
<andromda>
<properties>
- <property name="failOnValidationErrors">false</property>
+ <property name="failOnValidationErrors">true</property>
</properties>
<repositories>
<repository name="netBeansMDR">
|
|
From: Eric C. <ecr...@us...> - 2006-06-22 20:30:26
|
User: ecrutchfield
Date: 06/06/22 13:30:25
Modified: andromda-cs/src/main/resources/templates/cs Enumeration.vsl
Log:
fix enumeration for none Int32 types
Revision Changes Path
1.2 +4 -1 cartridges/andromda-cs/src/main/resources/templates/cs/Enumeration.vsl
Index: Enumeration.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/main/resources/templates/cs/Enumeration.vsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- Enumeration.vsl 8 Mar 2006 04:10:51 -0000 1.1
+++ Enumeration.vsl 22 Jun 2006 20:30:25 -0000 1.2
@@ -1,3 +1,6 @@
+#if ($enumeration.literalType.name != "int")
+#set ($enumType = $enumeration.literalType.name)
+#end
// Name: ${enumeration.name}.cs
// license-header cs merge-point
//
@@ -13,7 +16,7 @@
/// <summary>
$enumeration.getDocumentation(" /// ")
/// </summary>
- public enum $enumeration.name
+ public enum#if ($stringUtils.isNotBlank($enumType)) :$enumType#end $enumeration.name
{
#foreach ($literal in $enumeration.literals)
#if ($literal.defaultValue)
|
|
From: Eric C. <ecr...@us...> - 2006-06-22 20:29:51
|
User: ecrutchfield
Date: 06/06/22 13:29:50
Modified: andromda-cs pom.xml
Log:
add andromda-site plugin and turn on testing
Revision Changes Path
1.3 +26 -7 cartridges/andromda-cs/pom.xml
Index: pom.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/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 22 Jun 2006 20:29:50 -0000 1.3
@@ -10,7 +10,7 @@
<artifactId>andromda-cs-cartridge</artifactId>
<packaging>andromda-cartridge</packaging>
<name>AndroMDA C# Cartridge</name>
- <description>Produces C# value objects from a model.</description>
+ <description>Produces C# objects from a model.</description>
<developers>
<developer>
<name>Naresh Bhatia</name>
@@ -44,10 +44,29 @@
<locales>en</locales>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.andromda.maven.plugins</groupId>
+ <artifactId>andromda-site-plugin</artifactId>
+ <version>3.2-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>profile-transform</id>
+ <goals>
+ <goal>profile-xsl</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>namespace-transform</id>
+ <goals>
+ <goal>namespace-xsl</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<properties>
- <maven.test.skip>true</maven.test.skip>
+ <maven.test.skip>false</maven.test.skip>
<model.uri>file:${pom.basedir}/src/main/uml/empty-model.xmi</model.uri>
<test.model.uri>jar:file:${pom.basedir}/src/test/uml/CsCartridgeTestModel.xml.zip!/CsCartridgeTestModel.xml</test.model.uri>
</properties>
|
|
From: Eric C. <ecr...@us...> - 2006-06-22 20:28:28
|
User: ecrutchfield
Date: 06/06/22 13:28:27
Modified: andromda-cs/src/test/expected cartridge-output.zip
andromda-cs/src/test/uml CsCartridgeTestModel.xml.zip
Added: andromda-cs/src/test/expected/org/andromda/cartridges/csharp
SelfReferencingValueObject.cs TemplateTestVO.cs
TestValueObject.cs RelatedValueObject.cs
OrderedValueObject.cs TestIntEnumeration.cs
TestEnumeration.cs
Log:
Add tests
Revision Changes Path
1.1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/SelfReferencingValueObject.cs
Index: SelfReferencingValueObject.cs
===================================================================
// Name: SelfReferencingValueObject.cs
/**
* Example license header for Cs files
*
* http://www.andromda.org/
*/
//
// Attention: Generated code! Do not modify by hand!
// Generated by: ValueObject.vsl in andromda-cs-cartridge.
using System;
namespace org.andromda.cartridges.csharp
{
/// <summary>
///
/// </summary>
[Serializable]
public class SelfReferencingValueObject
{
// ----- Attributes and Associations -----
private org.andromda.cartridges.csharp.SelfReferencingValueObject reference;
// ----- Constructors -----
public SelfReferencingValueObject()
{
}
/// <summary>
/// Copy constructor
/// </summary>
public SelfReferencingValueObject(SelfReferencingValueObject otherBean)
{
if (otherBean != null)
{
this.reference = otherBean.reference;
}
}
// ----- Accessors -----
/// <summary>
///
/// </summary>
public org.andromda.cartridges.csharp.SelfReferencingValueObject Reference
{
get { return reference; }
set { this.reference = value; }
}
// ValueObject.vsl merge-point
}
}
1.1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TemplateTestVO.cs
Index: TemplateTestVO.cs
===================================================================
// Name: TemplateTestVO.cs
/**
* Example license header for Cs files
*
* http://www.andromda.org/
*/
//
// Attention: Generated code! Do not modify by hand!
// Generated by: ValueObject.vsl in andromda-cs-cartridge.
using System;
namespace org.andromda.cartridges.csharp
{
/// <summary>
///
/// </summary>
[Serializable]
public class TemplateTestVO
{
// ----- Attributes and Associations -----
private int someAttribute;
private org.andromda.cartridges.csharp.TemplateTestVO[] reference;
// ----- Constructors -----
public TemplateTestVO()
{
}
/// <summary>
/// Constructor taking all properties.
/// </summary>
public TemplateTestVO(
int someAttribute,
org.andromda.cartridges.csharp.TemplateTestVO[] reference)
{
this.someAttribute = someAttribute;
this.reference = reference;
}
/// <summary>
/// Copy constructor
/// </summary>
public TemplateTestVO(TemplateTestVO otherBean)
{
if (otherBean != null)
{
this.someAttribute = otherBean.someAttribute;
this.reference = otherBean.reference;
}
}
// ----- Accessors -----
/// <summary>
///
/// </summary>
public int SomeAttribute
{
get { return someAttribute; }
set { this.someAttribute = value; }
}
/// <summary>
///
/// </summary>
public org.andromda.cartridges.csharp.TemplateTestVO[] Reference
{
get { return reference; }
set { this.reference = value; }
}
// ValueObject.vsl merge-point
}
}
1.1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestValueObject.cs
Index: TestValueObject.cs
===================================================================
// Name: TestValueObject.cs
/**
* Example license header for Cs files
*
* http://www.andromda.org/
*/
//
// Attention: Generated code! Do not modify by hand!
// Generated by: ValueObject.vsl in andromda-cs-cartridge.
using System;
namespace org.andromda.cartridges.csharp
{
/// <summary>
/// <p>
/// A test complex type.
/// </p>
/// </summary>
[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 -----
public TestValueObject()
{
}
/// <summary>
/// Constructor taking all properties.
/// </summary>
public TestValueObject(
System.Collections.ICollection attributeOne,
int? attributeTwo,
org.andromda.cartridges.csharp.RelatedValueObject[] relatedValueObjects,
org.andromda.cartridges.csharp.OrderedValueObject[] orderedValueObjects)
{
this.attributeOne = attributeOne;
this.attributeTwo = attributeTwo;
this.relatedValueObjects = relatedValueObjects;
this.orderedValueObjects = orderedValueObjects;
}
/// <summary>
/// Copy constructor
/// </summary>
public TestValueObject(TestValueObject otherBean)
{
if (otherBean != null)
{
this.attributeOne = otherBean.attributeOne;
this.attributeTwo = otherBean.attributeTwo;
this.relatedValueObjects = otherBean.relatedValueObjects;
this.orderedValueObjects = otherBean.orderedValueObjects;
}
}
// ----- Accessors -----
/// <summary>
///
/// </summary>
public System.Collections.ICollection AttributeOne
{
get { return attributeOne; }
set { this.attributeOne = value; }
}
/// <summary>
///
/// </summary>
public int? AttributeTwo
{
get { return attributeTwo; }
set { this.attributeTwo = value; }
}
/// <summary>
///
/// </summary>
public org.andromda.cartridges.csharp.RelatedValueObject[] RelatedValueObjects
{
get { return relatedValueObjects; }
set { this.relatedValueObjects = value; }
}
/// <summary>
///
/// </summary>
public org.andromda.cartridges.csharp.OrderedValueObject[] OrderedValueObjects
{
get { return orderedValueObjects; }
set { this.orderedValueObjects = value; }
}
// ValueObject.vsl merge-point
}
}
1.1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/RelatedValueObject.cs
Index: RelatedValueObject.cs
===================================================================
// Name: RelatedValueObject.cs
/**
* Example license header for Cs files
*
* http://www.andromda.org/
*/
//
// Attention: Generated code! Do not modify by hand!
// Generated by: ValueObject.vsl in andromda-cs-cartridge.
using System;
namespace org.andromda.cartridges.csharp
{
/// <summary>
///
/// </summary>
[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 -----
public RelatedValueObject()
{
}
/// <summary>
/// Constructor taking all properties.
/// </summary>
public RelatedValueObject(
org.andromda.cartridges.csharp.TestSuperInterface1 oneAttribute,
org.andromda.cartridges.csharp.TestValueObject testValueObject,
org.andromda.cartridges.csharp.TestEnumeration testEnumeration)
{
this.oneAttribute = oneAttribute;
this.testValueObject = testValueObject;
this.testEnumeration = testEnumeration;
}
/// <summary>
/// Copy constructor
/// </summary>
public RelatedValueObject(RelatedValueObject otherBean)
{
if (otherBean != null)
{
this.oneAttribute = otherBean.oneAttribute;
this.testValueObject = otherBean.testValueObject;
this.testEnumeration = otherBean.testEnumeration;
}
}
// ----- Accessors -----
/// <summary>
///
/// </summary>
public org.andromda.cartridges.csharp.TestSuperInterface1 OneAttribute
{
get { return oneAttribute; }
set { this.oneAttribute = value; }
}
/// <summary>
///
/// </summary>
public org.andromda.cartridges.csharp.TestValueObject TestValueObject
{
get { return testValueObject; }
set { this.testValueObject = value; }
}
/// <summary>
///
/// </summary>
public org.andromda.cartridges.csharp.TestEnumeration TestEnumeration
{
get { return testEnumeration; }
set { this.testEnumeration = value; }
}
// ValueObject.vsl merge-point
}
}
1.1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/OrderedValueObject.cs
Index: OrderedValueObject.cs
===================================================================
// Name: OrderedValueObject.cs
/**
* Example license header for Cs files
*
* http://www.andromda.org/
*/
//
// Attention: Generated code! Do not modify by hand!
// Generated by: ValueObject.vsl in andromda-cs-cartridge.
using System;
namespace org.andromda.cartridges.csharp
{
/// <summary>
///
/// </summary>
[Serializable]
public class OrderedValueObject
{
// ----- Attributes and Associations -----
private org.andromda.cartridges.csharp.TestValueObject testValueObject;
// ----- Constructors -----
public OrderedValueObject()
{
}
/// <summary>
/// Constructor taking all properties.
/// </summary>
public OrderedValueObject(
org.andromda.cartridges.csharp.TestValueObject testValueObject)
{
this.testValueObject = testValueObject;
}
/// <summary>
/// Copy constructor
/// </summary>
public OrderedValueObject(OrderedValueObject otherBean)
{
if (otherBean != null)
{
this.testValueObject = otherBean.testValueObject;
}
}
// ----- Accessors -----
/// <summary>
///
/// </summary>
public org.andromda.cartridges.csharp.TestValueObject TestValueObject
{
get { return testValueObject; }
set { this.testValueObject = value; }
}
// ValueObject.vsl merge-point
}
}
1.1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestIntEnumeration.cs
Index: TestIntEnumeration.cs
===================================================================
// Name: TestIntEnumeration.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 TestIntEnumeration
{
ATTRIBUTE_ONE = 12,
ATTRIBUTE_TWO = 14
// Enumeration.vsl merge-point
}
}
1.1 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp/TestEnumeration.cs
Index: TestEnumeration.cs
===================================================================
// Name: TestEnumeration.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 :Long TestEnumeration
{
TEST1 = 0,
TEST2 = 1203212
// Enumeration.vsl merge-point
}
}
1.2 +25 -41 cartridges/andromda-cs/src/test/expected/cartridge-output.zip
<<Binary file>>
1.2 +77 -37 cartridges/andromda-cs/src/test/uml/CsCartridgeTestModel.xml.zip
<<Binary file>>
|
|
From: Eric C. <ecr...@us...> - 2006-06-22 20:28:28
|
User: ecrutchfield Date: 06/06/22 13:28:23 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges/csharp - New directory |
|
From: Eric C. <ecr...@us...> - 2006-06-22 20:28:23
|
User: ecrutchfield Date: 06/06/22 13:28:23 cartridges/andromda-cs/src/test/expected/org/andromda/cartridges - New directory |
|
From: Eric C. <ecr...@us...> - 2006-06-22 20:28:23
|
User: ecrutchfield Date: 06/06/22 13:28:23 cartridges/andromda-cs/src/test/expected/org/andromda - New directory |
|
From: Eric C. <ecr...@us...> - 2006-06-22 20:28:23
|
User: ecrutchfield Date: 06/06/22 13:28:23 cartridges/andromda-cs/src/test/expected/org - New directory |
|
From: Eric C. <ecr...@us...> - 2006-06-22 20:27:07
|
User: ecrutchfield Date: 06/06/22 13:27:04 Modified: andromda-cs/src/site site.xml Added: andromda-cs/src/site/xdoc .cvsignore Log: Apply andromda-site plugin Revision Changes Path 1.2 +10 -5 cartridges/andromda-cs/src/site/site.xml Index: site.xml =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-cs/src/site/site.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- site.xml 8 Mar 2006 04:10:51 -0000 1.1 +++ site.xml 22 Jun 2006 20:27:04 -0000 1.2 @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="iso-8859-1"?> <project name="C# Cartridge Plugin"> - <title>C# Cartridge</title> - <banner> - <name>AndroMDA</name> - <href>http://team.andromda.org/</href> - </banner> + <skin> + <groupId>org.andromda.maven.site</groupId> + <artifactId>andromda-site-skin</artifactId> + <version>3.2-SNAPSHOT</version> + </skin> + <bannerLeft> + <name></name> + </bannerLeft> + <publishDate format="dd MMM yyyy hh:mm zzz"/> <body> <links> <item name="C#" href="index.html"/> @@ -15,5 +19,6 @@ <item name="Profile" href="profile.html"/> <item name="Namespace" href="namespace.html"/> </menu> + ${reports} </body> </project> 1.1 cartridges/andromda-cs/src/site/xdoc/.cvsignore Index: .cvsignore =================================================================== namespace.xml profile.xml |
|
From: Chris M. <cm...@us...> - 2006-06-22 15:14:52
|
User: cmicali
Date: 06/06/22 08:14:48
Modified: etc/andromda-dotnet/AndroMDA.VS80AddIn AndroMDA VS2005
Add-In Readme.rtf
etc/andromda-dotnet/AndroMDA.VS80AddIn/Installer AndroMDA
VS2005 Add-In Setup.exe
Log:
- Updated date in readme
- Updated installer
- Released v1.3.1 to sourceforge
Revision Changes Path
No revision
No revision
No revision
No revision
No revision
No revision
No revision
No revision
|
|
From: Vance K. <va...@us...> - 2006-06-17 12:02:22
|
User: vancek
Date: 06/06/17 05:02:21
Modified: andromda-ejb3/src/site/xdoc installation.xml index.xml
andromda-ejb3/src/site site.xml
andromda-ejb3/src/changes changes.xml
Added: andromda-ejb3/src/site/fml faq.fml
Log:
site update + FAQ
Revision Changes Path
1.2 +9 -2 cartridges/andromda-ejb3/src/site/xdoc/installation.xml
Index: installation.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/installation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- installation.xml 29 May 2006 06:39:00 -0000 1.1
+++ installation.xml 17 Jun 2006 12:02:21 -0000 1.2
@@ -18,9 +18,17 @@
You can install Maven
<a href="http://maven.apache.org/download.html#Installation">here</a>.
</p>
+ <p class="highlight">
+ If you want to build the site docs, you need to download the latest Maven 2.0.x source
+ from https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x and follow
+ the instructions to build, assemble and set your M2_HOME and PATH variables.
+ </p>
<p>
You need to have an instance of AndroMDA 3.2. At the time of writing this, 3.2 RC1
- was released. Alternatively, you can get the latest 3.2-SNAPSHOT from CVS and build it.
+ was released but the latest 3.2-SNAPSHOT from CVS contains updates to the project generator
+ and site plugin, and is more suitable to use with the EJB3 cartridge. Follow the anonymous
+ CVS access at <a href="http://sourceforge.net/cvs/?group_id=73047">AndroMDA project</a> to
+ checkout the latest <b>andromda-all</b>.
</p>
</subsection>
<a name="Getting_the_Cartridge"/>
@@ -71,7 +79,6 @@
<a href="HowToModel-src.zip">here</a> and extract to the target/site folder of the
andromda-ejb3 plugin.
</p>
-
</subsection>
</section>
<section name="Next">
1.4 +3 -2 cartridges/andromda-ejb3/src/site/xdoc/index.xml
Index: index.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/xdoc/index.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- index.xml 29 May 2006 01:53:36 -0000 1.3
+++ index.xml 17 Jun 2006 12:02:21 -0000 1.4
@@ -5,11 +5,12 @@
<title>AndroMDA - EJB3 - Introduction</title>
</properties>
<body>
- <section name="AndroMDA EJB Cartridge">
+ <section name="AndroMDA EJB3 Cartridge">
<p>
The purpose of this cartridge is to generate EJB 3.0 compliant persistence tier, fronted by
Session EJB business object facades. To learn how to use this cartridge you can follow the,
- howtos similart to a tutorial. You do not need to navigate the howtos sequentially.
+ howtos, reference the profile and namespace properties and try the examples in the howto yourself.
+ You do not need to navigate the howtos sequentially.
</p>
<p>
Please see the <a href="profile.html">Profile</a> and <a href="namespace.html">Namespace</a>
1.15 +4 -0 cartridges/andromda-ejb3/src/site/site.xml
Index: site.xml
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/site.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- site.xml 29 May 2006 01:50:49 -0000 1.14
+++ site.xml 17 Jun 2006 12:02:21 -0000 1.15
@@ -47,6 +47,10 @@
<item name="Embeddable Value Objects" href="howto20.html"/>
<item name="Tips & Tricks" href="tips.html"/>
</menu>
+ <menu name="Support">
+ <item name="FAQ" href="faq.html"/>
+ <item name="EJB Forum" href="http://galaxy.andromda.org/forum/viewforum.php?f=17"/>
+ </menu>
${reports}
</body>
</project>
1.1 cartridges/andromda-ejb3/src/site/fml/faq.fml
Index: faq.fml
===================================================================
<?xml version="1.0"?>
<faqs id="General FAQ">
<part id="General">
<faq id="problem_installing">
<question>Problems installing the EJB3 cartridge?</question>
<answer>
<p>
Re-read the installation howto. If that doesn't help, post a new topic in the EJB cartridge forum.
Do not post in the sticky guides.
</p>
</answer>
</faq>
<faq id="release">
<question>When is the EJB3 cartridge going to be released?</question>
<answer>
<p>
Hopefully soon. Thanks to a few people who use the cartridge, we are able to fix some of the issues
with releasing a new cartride. Unfortunately, until JBoss AS 5, the JBoss EJB 3.0 implementation will
not satisfy the EJB 3.0 FR specification, although it is very close.
</p>
</answer>
</faq>
<faq id="jboss_seam">
<question>Is JBoss Seam going to be supported?</question>
<answer>
<p>
That is definitely in the pipeworks. There is some initial support in the cartridge in CVS, but no
documentation as yet. Stay tuned and keep your eye on the EJB cartridge forum.
</p>
</answer>
</faq>
<faq id="migrating_from_hibernate">
<question>Migrating from Hibernate to EJB3?</question>
<answer>
<p>
Migrating from Hibernate will be easier than you think. Just remember that if you have specified
tagged values with tags in the <b>andromda.hibernate</b> namespace, you need to change these to the
corresponding tag in the <b>andromda.persistence</b> namespace. Check the
<a href="profile.html">profile</a> page to find the tagged value you are looking for.
</p>
</answer>
</faq>
</part>
</faqs>
1.8 +6 -3 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.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- changes.xml 17 Jun 2006 03:51:02 -0000 1.7
+++ changes.xml 17 Jun 2006 12:02:21 -0000 1.8
@@ -105,6 +105,9 @@
render the DiscriminatorValue annotation. This annotation should only be rendered in subclasses of
single table inheritance hierarchies.
</action>
+ <action dev="vancek" type="add">
+ Added FAQ support section menu to site.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-06-17 12:02:14
|
User: vancek Date: 06/06/17 05:02:13 cartridges/andromda-ejb3/src/site/fml - New directory |
|
From: Vance K. <va...@us...> - 2006-06-17 03:51:05
|
User: vancek
Date: 06/06/16 20:51:02
Modified: andromda-ejb3/src/changes changes.xml
andromda-ejb3/src/main/resources/templates/ejb3
EntityEmbeddable.vsl
Log:
DiscriminatorValue annotation should not be rendered on subclasses where the super entity is an mapped superclass
Revision Changes Path
1.7 +5 -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.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- changes.xml 14 Jun 2006 14:37:25 -0000 1.6
+++ changes.xml 17 Jun 2006 03:51:02 -0000 1.7
@@ -100,6 +100,11 @@
<action dev="vancek" due-to="tlu" type="update">
Generate documentation for enumeration literals.
</action>
+ <action dev="vancek" type="fix">
+ Inheritance hierarchies where the super class is a mapped superclass, the subclass should not
+ render the DiscriminatorValue annotation. This annotation should only be rendered in subclasses of
+ single table inheritance hierarchies.
+ </action>
</release>
</body>
</document>
\ No newline at end of file
1.32 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
Index: EntityEmbeddable.vsl
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -w -r1.31 -r1.32
--- EntityEmbeddable.vsl 14 Jun 2006 04:55:20 -0000 1.31
+++ EntityEmbeddable.vsl 17 Jun 2006 03:51:02 -0000 1.32
@@ -75,7 +75,7 @@
@javax.persistence.DiscriminatorColumn(#if ($entity.discriminatorColumn)name = "${entity.discriminatorColumn}"#set ($argExists = true)#end#if ($entity.discriminatorType)#if ($argExists), #end#**#discriminatorType = javax.persistence.DiscriminatorType.${entity.discriminatorType}#set ($argExists = true)#end#if ($entity.discriminatorColumnDefinition)#if ($argExists), #end#**#columnDefinition = "${entity.discriminatorColumnDefinition}"#set ($argExists = true)#end#if ($entity.discriminatorLength > 0)#if ($argExists), #end#**#length = ${entity.discriminatorLength}#end)
@javax.persistence.DiscriminatorValue("${entity.discriminatorValue}")
#* *##end
-#**##elseif ($entity.requiresGeneralizationMapping && $entity.inheritanceSingleTable)
+#**##elseif ($entity.requiresGeneralizationMapping && $entity.inheritanceSingleTable && !$entity.embeddableSuperclassGeneralizationExists)
##
## Only include the DiscriminatorValue annotation for subclasses if
## the inheritance strategy is single table mapping strategy.
|
|
From: Eric C. <ecr...@us...> - 2006-06-15 16:48:27
|
User: ecrutchfield Date: 06/06/15 09:48:18 Modified: andromda-nspring/src/main/uml SpringMetafacadeModel.xml.zip Log: updated to latest version from andromda-all/contrib and changed model references to use <maven2.repository> Revision Changes Path 1.3 +111 -104 cartridges/andromda-nspring/src/main/uml/SpringMetafacadeModel.xml.zip <<Binary file>> |
