[Andromdaplugins-cvs] CVS update: cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate NHibernateEmbeddedValue.vsl NHibernateEntity.vsl NHibernateEntityImpl.vsl NHibernateEnumeration.vsl nhibernate.hbm.xml.vsl

[Chris M. <cm...@us...>]

  User: cmicali 
  Date: 06/10/18 05:37:32

  Modified:    andromda-nhibernate/src/main/resources/templates/nhibernate
                        NHibernateEmbeddedValue.vsl NHibernateEntity.vsl
                        NHibernateEntityImpl.vsl NHibernateEnumeration.vsl
                        nhibernate.hbm.xml.vsl
  Log:
  - Fix for [NETCART-10]
  - Added merge-points to templates
  
  Revision  Changes    Path
  1.5       +4 -1      cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValue.vsl
  
  Index: NHibernateEmbeddedValue.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEmbeddedValue.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- NHibernateEmbeddedValue.vsl	2 Oct 2006 01:21:47 -0000	1.4
  +++ NHibernateEmbeddedValue.vsl	18 Oct 2006 12:37:31 -0000	1.5
  @@ -3,7 +3,7 @@
   // license-header cs merge-point
   //
   // Attention: Generated code! Do not modify by hand!
  -// Generated by: HibernateEmbeddedValue.vsl in andromda-nhibernate-cartridge.
  +// Generated by: NHibernateEmbeddedValue.vsl in andromda-nhibernate-cartridge.
   
   using System;
   
  @@ -122,6 +122,9 @@
           /// Returns a hash code based on class attributes.
           /// </summary>
   #renderHashCodeMethod($embeddedValue $embeddedValue.attributes)
  +
  +        // NHibernateEmbeddedValue.vsl merge-point
  +        
       }
   #if ($stringUtils.isNotBlank($embeddedValue.packageName))
   }
  
  
  
  1.7       +2 -2      cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl
  
  Index: NHibernateEntity.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntity.vsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- NHibernateEntity.vsl	2 Oct 2006 01:21:47 -0000	1.6
  +++ NHibernateEntity.vsl	18 Oct 2006 12:37:31 -0000	1.7
  @@ -3,7 +3,7 @@
   // license-header cs merge-point
   //
   // Attention: Generated code! Do not modify by hand!
  -// Generated by: HibernateEntity.vsl in andromda-nhibernate-cartridge.
  +// Generated by: NHibernateEntity.vsl in andromda-nhibernate-cartridge.
   
   using System;
   
  @@ -209,7 +209,7 @@
   		#endregion
   		
   #end
  -    // HibernateEntity.vsl merge-point
  +    // NHibernateEntity.vsl merge-point
       
       }
   #if (!$entity.abstract && ($visualStudioVersion == "2003"))
  
  
  
  1.3       +2 -1      cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImpl.vsl
  
  Index: NHibernateEntityImpl.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEntityImpl.vsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- NHibernateEntityImpl.vsl	9 Apr 2006 14:32:40 -0000	1.2
  +++ NHibernateEntityImpl.vsl	18 Oct 2006 12:37:31 -0000	1.3
  @@ -3,7 +3,7 @@
   // license-header cs merge-point
   //
   // Attention: Generated code! Do not modify by hand!
  -// Generated by: HibernateEntityImpl.vsl in andromda-nhibernate-cartridge.
  +// Generated by: NHibernateEntityImpl.vsl in andromda-nhibernate-cartridge.
   
   using System;
   
  @@ -18,6 +18,7 @@
       public#if ($entity.abstract) abstract#end class $entity.entityImplementationName
           : $entity.fullyQualifiedEntityName
       {
  +        // NHibernateEntityImpl.vsl merge-point
       }
   #if ($stringUtils.isNotBlank($entity.packageName))
   }
  
  
  
  1.2       +4 -3      cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEnumeration.vsl
  
  Index: NHibernateEnumeration.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/NHibernateEnumeration.vsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- NHibernateEnumeration.vsl	8 Mar 2006 04:15:24 -0000	1.1
  +++ NHibernateEnumeration.vsl	18 Oct 2006 12:37:31 -0000	1.2
  @@ -1,9 +1,10 @@
  -// license-header java merge-point
  +#set ($generatedFile = "${stringUtils.replace($enumeration.packageName, '.', '/')}/${enumeration.enumerationName}.cs")
  +// Name: ${generatedFile}.cs
  +// license-header cs merge-point
   //
   // Attention: Generated code! Do not modify by hand!
  -// Generated by: HibernateEnumeration.vsl in andromda-nhibernate-cartridge.
  +// Generated by: NHibernateEnumeration.vsl in andromda-nhibernate-cartridge.
   //
  -#set ($generatedFile = "${stringUtils.replace($enumeration.packageName, '.', '/')}/${enumeration.enumerationName}.cs")
   #if ($stringUtils.isNotBlank($enumeration.packageName))
   package $enumeration.packageName;
   #end
  
  
  
  1.3       +1 -1      cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/nhibernate.hbm.xml.vsl
  
  Index: nhibernate.hbm.xml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nhibernate/src/main/resources/templates/nhibernate/nhibernate.hbm.xml.vsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- nhibernate.hbm.xml.vsl	15 Aug 2006 22:48:46 -0000	1.2
  +++ nhibernate.hbm.xml.vsl	18 Oct 2006 12:37:31 -0000	1.3
  @@ -62,5 +62,5 @@
   #end## foreach
   #end## ($entity.requiresMappingSpecialization)
       </class>
  -
  +    <!-- NHibernate.hbm.xml.vsl merge-point -->
   </hibernate-mapping>
  \ No newline at end of file