[Andromdaplugins-cvs] CVS update: cartridges/andromda-nspring/src/main/resources/templates/nspring NSpringDaoFactory.vsl NSpringHibernateDaoBase.vsl NSpringServiceBase.vsl NSpringServiceImpl.vsl

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

  User: cmicali 
  Date: 07/07/31 22:07:06

  Modified:    andromda-nspring/src/main/resources/templates/nspring
                        NSpringDaoFactory.vsl NSpringHibernateDaoBase.vsl
                        NSpringServiceBase.vsl NSpringServiceImpl.vsl
  Log:
  - Removed override keyword from method declarations
  - Removed abstract methods in base class
  - Updated DaoBase NHibernate .Find() calls to .CreateQuery()
  
  Revision  Changes    Path
  1.5       +1 -1      cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringDaoFactory.vsl
  
  Index: NSpringDaoFactory.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringDaoFactory.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- NSpringDaoFactory.vsl	18 Oct 2006 12:44:45 -0000	1.4
  +++ NSpringDaoFactory.vsl	1 Aug 2007 05:07:04 -0000	1.5
  @@ -27,7 +27,7 @@
           public static ${entity.packageName}.I${entity.entityName}Dao Get${entity.entityName}Dao()
           {
               if (_${entity.entityName}Dao == null)
  -                _${entity.entityName}Dao = new ${entity.packageName}.${entity.entityName}DaoImpl();
  +                _${entity.entityName}Dao = new ${entity.packageName}.${entity.entityName}Dao();
               return _${entity.entityName}Dao;
           }
   
  
  
  
  1.8       +6 -6      cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoBase.vsl
  
  Index: NSpringHibernateDaoBase.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoBase.vsl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -w -r1.7 -r1.8
  --- NSpringHibernateDaoBase.vsl	1 Aug 2007 04:14:16 -0000	1.7
  +++ NSpringHibernateDaoBase.vsl	1 Aug 2007 05:07:05 -0000	1.8
  @@ -51,10 +51,10 @@
           : NHibernateDaoSupport, $entity.fullyQualifiedDaoName
   #end
       {
  -#foreach ($valueObjectRef in $entity.valueObjectReferences)
  -        public abstract $valueObjectRef.targetElement.fullyQualifiedName ${valueObjectRef.transformationMethodName}($entity.fullyQualifiedEntityName entity);
  -        public abstract $entity.fullyQualifiedEntityName ${valueObjectRef.transformationToEntityMethodName}($valueObjectRef.targetElement.fullyQualifiedName $stringUtils.uncapitalize($valueObjectRef.name));
  -#end
  +##foreach ($valueObjectRef in $entity.valueObjectReferences)
  +##        public abstract $valueObjectRef.targetElement.fullyQualifiedName ${valueObjectRef.transformationMethodName}($entity.fullyQualifiedEntityName entity);
  +##        public abstract $entity.fullyQualifiedEntityName ${valueObjectRef.transformationToEntityMethodName}($valueObjectRef.targetElement.fullyQualifiedName $stringUtils.uncapitalize($valueObjectRef.name));
  +##end
   
   #foreach($entityRef in $entity.entityReferences)
   #set ($daoPropertyName = "$stringUtils.capitalize($entityRef.name)Dao")
  @@ -108,7 +108,7 @@
           /// </summary>
           public $inheritanceModifierAllEntityMethod System.Collections.IList LoadAll(int transform)
           {
  -            System.Collections.IList entities = Session.Find("from ${entity.fullyQualifiedEntityImplementationName}");
  +            System.Collections.IList entities = Session.CreateQuery("from ${entity.fullyQualifiedEntityImplementationName}").List();
               System.Collections.IList results = this.TransformEntities(transform, entities);
               return results;
           }
  
  
  
  1.5       +0 -5      cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceBase.vsl
  
  Index: NSpringServiceBase.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceBase.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- NSpringServiceBase.vsl	1 Aug 2007 04:14:17 -0000	1.4
  +++ NSpringServiceBase.vsl	1 Aug 2007 05:07:05 -0000	1.5
  @@ -114,11 +114,6 @@
           }
   
   #end
  -        /// <summary>
  -        /// Performs the core logic for {@link #${operation.getSignature(false)}}
  -        /// <summary>
  -        protected abstract $operation.returnType.fullyQualifiedName $operation.implementationSignature;
  -
   #end
   
           // NSpringServiceBase.vsl merge-point
  
  
  
  1.5       +1 -3      cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceImpl.vsl
  
  Index: NSpringServiceImpl.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceImpl.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- NSpringServiceImpl.vsl	1 Aug 2007 04:14:17 -0000	1.4
  +++ NSpringServiceImpl.vsl	1 Aug 2007 05:07:05 -0000	1.5
  @@ -17,8 +17,6 @@
       /// </summary>
       public#if($service.abstract) abstract#end partial class $service.implementationName
       {
  -        private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof($service.implementationName));
  -
   #foreach ($operation in $service.operations)
           /// <summary>
           /// @see ${service.fullyQualifiedName}#${operation.getSignature(false)}
  @@ -29,7 +27,7 @@
   #else
   #set ($termination = "")
   #end
  -        protected#if ($abstract) abstract#else override#end $operation.returnType.fullyQualifiedName $operation.implementationSignature$termination
  +        protected#if ($abstract) abstract#end $operation.returnType.fullyQualifiedName $operation.implementationSignature$termination
   #if (!$abstract)
           {
               // put your implementation here