andromdaplugins-cvs

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

  User: cmicali 
  Date: 06/10/18 05:44:47

  Modified:    andromda-nspring/src/main/resources/templates/nspring
                        NSpringDaoFactory.vsl NSpringDaoInterface.vsl
                        NSpringHibernateDaoBase.vsl
                        NSpringHibernateDaoImpl.vsl NSpringServiceBase.vsl
                        NSpringServiceException.vsl NSpringServiceImpl.vsl
                        NSpringServiceInterface.vsl
  Log:
  - Fix for [NETCART-10]
  - Added merge-points to templates
  
  Revision  Changes    Path
  1.4       +2 -0      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.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- NSpringDaoFactory.vsl	15 Aug 2006 22:48:47 -0000	1.3
  +++ NSpringDaoFactory.vsl	18 Oct 2006 12:44:45 -0000	1.4
  @@ -32,5 +32,7 @@
           }
   
   #end
  +        // NSpringDaoFactory.vsl merge-point
  +        
       }
   }
  \ No newline at end of file
  
  
  
  1.4       +1 -0      cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringDaoInterface.vsl
  
  Index: NSpringDaoInterface.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringDaoInterface.vsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- NSpringDaoInterface.vsl	15 Jun 2006 14:59:55 -0000	1.3
  +++ NSpringDaoInterface.vsl	18 Oct 2006 12:44:45 -0000	1.4
  @@ -348,6 +348,7 @@
   #end
   
   #end
  +        // NSpringDaoInterface.vsl merge-point
       }
   #if ($stringUtils.isNotBlank($entity.packageName))
   }
  
  
  
  1.6       +3 -0      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.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- NSpringHibernateDaoBase.vsl	15 Aug 2006 22:48:47 -0000	1.5
  +++ NSpringHibernateDaoBase.vsl	18 Oct 2006 12:44:45 -0000	1.6
  @@ -647,6 +647,9 @@
           }
   
   #end
  +
  +        // NSpringHibernateDaoBase.vsl merge-point
  +        
       }
   #if ($stringUtils.isNotBlank($entity.packageName))
   }
  
  
  
  1.4       +5 -0      cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoImpl.vsl
  
  Index: NSpringHibernateDaoImpl.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringHibernateDaoImpl.vsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- NSpringHibernateDaoImpl.vsl	15 Jun 2006 14:59:55 -0000	1.3
  +++ NSpringHibernateDaoImpl.vsl	18 Oct 2006 12:44:46 -0000	1.4
  @@ -63,6 +63,11 @@
           }
   
   #end
  +#if (!$entity.daoImplementationRequired)
  +
  +        // NSpringHibernateDaoImpl.vsl merge-point
  +
  +#end
       }
   #if ($stringUtils.isNotBlank($entity.packageName))
   }
  
  
  
  1.3       +3 -0      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.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- NSpringServiceBase.vsl	2 Oct 2006 01:21:47 -0000	1.2
  +++ NSpringServiceBase.vsl	18 Oct 2006 12:44:46 -0000	1.3
  @@ -120,6 +120,9 @@
           protected abstract $operation.returnType.fullyQualifiedName $operation.implementationSignature;
   
   #end
  +
  +        // NSpringServiceBase.vsl merge-point
  +
       }
   #if ($stringUtils.isNotBlank($service.packageName))
   }
  
  
  
  1.4       +3 -0      cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceException.vsl
  
  Index: NSpringServiceException.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceException.vsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- NSpringServiceException.vsl	10 Oct 2006 03:58:58 -0000	1.3
  +++ NSpringServiceException.vsl	18 Oct 2006 12:44:46 -0000	1.4
  @@ -45,6 +45,9 @@
                   return new ${service.name}Exception(e);
               }
           }
  +
  +        // NSpringServiceException.vsl merge-point
  +
       }
       
   /*
  
  
  
  1.3       +3 -0      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.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- NSpringServiceImpl.vsl	15 Aug 2006 22:48:47 -0000	1.2
  +++ NSpringServiceImpl.vsl	18 Oct 2006 12:44:46 -0000	1.3
  @@ -43,6 +43,9 @@
   
   #end
   #end
  +
  +            // NSpringServiceImpl.vsl merge-point
  +            
       }
   #if ($stringUtils.isNotBlank($service.packageName))
   }
  
  
  
  1.2       +3 -0      cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceInterface.vsl
  
  Index: NSpringServiceInterface.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-nspring/src/main/resources/templates/nspring/NSpringServiceInterface.vsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- NSpringServiceInterface.vsl	15 Jun 2006 14:59:55 -0000	1.1
  +++ NSpringServiceInterface.vsl	18 Oct 2006 12:44:46 -0000	1.2
  @@ -38,6 +38,9 @@
   #end
   
   #end
  +
  +        // NSpringServiceInterface.vsl merge-point
  +
       }
   #if ($stringUtils.isNotBlank($service.packageName))
   }