From: <car...@us...> - 2005-04-30 22:06:45
|
User: carloslcuenca Date: 05/04/30 15:06:38 Modified: andromda-hibernate/src/java/org/andromda/cartridges/hibernate/metafacades HibernateEntityLogicImpl.java andromda-hibernate/src/META-INF andromda-cartridge.xml andromda-metafacades.xml andromda-hibernate/src/templates/hibernate hibernate.hbm.xml.vsl HibernateEntity.vsl andromda-hibernate/src/uml HibernateMetafacadeModel.xml.zip andromda-hibernate/src/test/expected cartridge-output.zip andromda-hibernate/xdocs modeling.xml namespace.xml etc/profile/src/uml andromda-profile.xml.zip andromda-hibernate/src/test/uml HibernateCartridgeTestModel.xml.zip Log: versions compatible with Rc2 Revision Changes Path 1.53 +3 -3 cartridges/andromda-hibernate/src/java/org/andromda/cartridges/hibernate/metafacades/HibernateEntityLogicImpl.java Index: HibernateEntityLogicImpl.java =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-hibernate/src/java/org/andromda/cartridges/hibernate/metafacades/HibernateEntityLogicImpl.java,v retrieving revision 1.52 retrieving revision 1.53 diff -u -w -r1.52 -r1.53 --- HibernateEntityLogicImpl.java 30 Apr 2005 21:01:15 -0000 1.52 +++ HibernateEntityLogicImpl.java 30 Apr 2005 22:05:14 -0000 1.53 @@ -592,9 +592,9 @@ } /** - * @see org.andromda.cartridges.hibernate.metafacades.HibernateEntity#isHibernateVersion() + * @see org.andromda.cartridges.hibernate.metafacades.HibernateEntity#getHibernateVersion() */ - protected boolean handleIsHibernateVersion() + protected String handleGetHibernateVersion() { String version = (String)this.findTaggedValue( HibernateProfile.TAGGEDVALUE_HIBERNATE_VERSION); @@ -602,7 +602,7 @@ { version = (String)this.getConfiguredProperty(HibernateGlobals.HIBERNATE_VERSION); } - return Boolean.valueOf(version).booleanValue(); + return version; } } \ No newline at end of file 1.70 +0 -1 cartridges/andromda-hibernate/src/META-INF/andromda-cartridge.xml Index: andromda-cartridge.xml =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-hibernate/src/META-INF/andromda-cartridge.xml,v retrieving revision 1.69 retrieving revision 1.70 diff -u -w -r1.69 -r1.70 --- andromda-cartridge.xml 30 Apr 2005 21:01:15 -0000 1.69 +++ andromda-cartridge.xml 30 Apr 2005 22:05:14 -0000 1.70 @@ -16,7 +16,6 @@ <!-- the name to give the service locator class --> <property reference="serviceLocatorName" default="ServiceLocator"/> <property reference="sequenceIdentifierSuffix" default="_SEQ"/> - <property reference="versionPropertyName" default="version"/> <property reference="driver" default=""/> <property reference="username" default=""/> <property reference="password" default=""/> 1.52 +1 -1 cartridges/andromda-hibernate/src/META-INF/andromda-metafacades.xml Index: andromda-metafacades.xml =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-hibernate/src/META-INF/andromda-metafacades.xml,v retrieving revision 1.51 retrieving revision 1.52 diff -u -w -r1.51 -r1.52 --- andromda-metafacades.xml 30 Apr 2005 21:01:20 -0000 1.51 +++ andromda-metafacades.xml 30 Apr 2005 22:05:14 -0000 1.52 @@ -24,7 +24,7 @@ <property reference="hibernateAssociationSortType" default="unsorted"/> <property reference="enumerationNamePattern" default="{0}Enum"/> <property reference="hibernateQueryUseSpecializedSetters" default="false"/> - <property reference="versionProperty" default="false"/> + <property reference="versionProperty" default=""/> <metafacade class="org.andromda.cartridges.hibernate.metafacades.HibernateEntityLogicImpl" contextRoot="true"> <mapping class="org.omg.uml.foundation.core.UmlClass$Impl"> <stereotype>ENTITY</stereotype> 1.24 +2 -2 cartridges/andromda-hibernate/src/templates/hibernate/hibernate.hbm.xml.vsl Index: hibernate.hbm.xml.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-hibernate/src/templates/hibernate/hibernate.hbm.xml.vsl,v retrieving revision 1.23 retrieving revision 1.24 diff -u -w -r1.23 -r1.24 --- hibernate.hbm.xml.vsl 30 Apr 2005 21:01:20 -0000 1.23 +++ hibernate.hbm.xml.vsl 30 Apr 2005 22:05:15 -0000 1.24 @@ -26,8 +26,8 @@ #if (!$entity.specializations.empty && $entity.hibernateInheritanceClass) <discriminator column="$entity.hibernateDiscriminatorColumn" type="$entity.hibernateDiscriminatorType"/> #end -#if ($entity.hibernateVersion && $stringUtils.isNotBlank($versionPropertyName)) - <version name="$versionPropertyName" type="int" column="$versionPropertyName"/> +#if ($stringUtils.isNotBlank($entity.hibernateVersion)) + <version name="$entity.hibernateVersion" type="int" column="$entity.hibernateVersion"/> #end ## If super inheritance is 'interface', render super properties etc #foreach ($generalization in $entity.allGeneralizations) 1.56 +8 -7 cartridges/andromda-hibernate/src/templates/hibernate/HibernateEntity.vsl Index: HibernateEntity.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-hibernate/src/templates/hibernate/HibernateEntity.vsl,v retrieving revision 1.55 retrieving revision 1.56 diff -u -w -r1.55 -r1.56 --- HibernateEntity.vsl 30 Apr 2005 21:01:20 -0000 1.55 +++ HibernateEntity.vsl 30 Apr 2005 22:05:15 -0000 1.56 @@ -22,21 +22,22 @@ */ private static final long serialVersionUID = ${entity.serialVersionUID}L; -#if ($entity.hibernateVersion && $stringUtils.isNotBlank($versionPropertyName)) -#set ($versionPropertyNameCapitalized = $stringUtils.capitalize($versionPropertyName)) +#if ($stringUtils.isNotBlank($entity.hibernateVersion)) +#set ($versionProperty = $entity.hibernateVersion) +#set ($versionPropertyCapitalized = $stringUtils.capitalize($entity.hibernateVersion)) /** * Version property managed by Hibernate. */ - private int $versionPropertyName; + private int $versionProperty; - public int get$versionPropertyNameCapitalized() + public int get$versionPropertyCapitalized() { - return this.$versionPropertyName; + return this.$versionProperty; } - private void set$versionPropertyNameCapitalized (int $versionPropertyName) + private void set$versionPropertyCapitalized (int $versionProperty) { - this.$versionPropertyName = $versionPropertyName; + this.$versionProperty = $versionProperty; } #end 1.63 +73 -68 cartridges/andromda-hibernate/src/uml/HibernateMetafacadeModel.xml.zip <<Binary file>> 1.125 +11 -8 cartridges/andromda-hibernate/src/test/expected/cartridge-output.zip <<Binary file>> 1.64 +2 -2 cartridges/andromda-hibernate/xdocs/modeling.xml Index: modeling.xml =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-hibernate/xdocs/modeling.xml,v retrieving revision 1.63 retrieving revision 1.64 diff -u -w -r1.63 -r1.64 --- modeling.xml 30 Apr 2005 21:21:41 -0000 1.63 +++ modeling.xml 30 Apr 2005 22:05:51 -0000 1.64 @@ -373,8 +373,8 @@ <a href="#Entity"><![CDATA[<<Entity>>]]></a> </td> <td> - Specfies wheter or not the entity will have a version property. The name of the version - property is specified within the <a href="namespace.html#versionProperty">versionProperty</a> + Specfies wheter or not the entity will have a version property. If a value is present, then the entity will have + a version property with the name specified within the tagged value. </td> </tr> <tr> 1.84 +3 -15 cartridges/andromda-hibernate/xdocs/namespace.xml Index: namespace.xml =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-hibernate/xdocs/namespace.xml,v retrieving revision 1.83 retrieving revision 1.84 diff -u -w -r1.83 -r1.84 --- namespace.xml 30 Apr 2005 21:21:41 -0000 1.83 +++ namespace.xml 30 Apr 2005 22:05:52 -0000 1.84 @@ -163,26 +163,14 @@ versionProperty </td> <td> - Specified the default value to automatically add to entities - version attribute. This value can be overwridden with the - <a href="modeling.html#andromda.hibernate.version">@andromda.hibernate.version</a>tagged value. - </td> - <td> - No, default is <code>false</code> - </td> - </tr> - <tr> - <td> - versionPropertyName - </td> - <td> The name of the property/attribute to automatically add to entities for versioning purposes. If this value is not specified or it contains only whitespace characters it will be ignored and the property will - not be generated. + not be generated. This value can be overwridden with the + <a href="modeling.html#andromda.hibernate.version">@andromda.hibernate.version</a>tagged value. </td> <td> - version + No </td> </tr> <tr> 1.125 +453 -470 productbuild/etc/profile/src/uml/andromda-profile.xml.zip <<Binary file>> 1.49 +142 -149 cartridges/andromda-hibernate/src/test/uml/HibernateCartridgeTestModel.xml.zip <<Binary file>> |