From: Vance K. <va...@us...> - 2006-04-24 02:39:18
|
User: vancek Date: 06/04/23 19:39:17 Modified: andromda-ejb3/src/main/resources/META-INF/andromda cartridge.xml Log: added GlobalMacros macro library, added DAO templates, added embedded value object templates, added entities modelElement to ejb-jar and jboss dd's Revision Changes Path 1.22 +118 -5 cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml Index: cartridge.xml =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/META-INF/andromda/cartridge.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -w -r1.21 -r1.22 --- cartridge.xml 11 Apr 2006 15:56:57 -0000 1.21 +++ cartridge.xml 24 Apr 2006 02:39:17 -0000 1.22 @@ -1,14 +1,16 @@ <cartridge> + <templateEngine className="org.andromda.templateengines.velocity.VelocityTemplateEngine"> + <macrolibrary name="templates/ejb3/GlobalMacros.vm"/> + <!-- cartridge-macrolibrary merge-point--> + </templateEngine> + <!-- define the template objects that are made availble to the template --> <templateObject name="stringUtils" className="org.apache.commons.lang.StringUtils"/> <templateObject name="collectionUtils" className="org.apache.commons.collections.CollectionUtils"/> <templateObject name="transform" className="org.andromda.cartridges.ejb3.EJB3ScriptHelper"/> - <!-- cartridge-templateObject merge-point--> - - <!-- cartridge-property merge-point--> - <!-- cartridge-resource merge-point --> + <!-- cartridge-templateObject merge-point--> <property reference="entityManagerName"/> <property reference="entityManagerJTADataSource"/> @@ -42,6 +44,19 @@ <property reference="enableClustering"/> <property reference="webServiceContextRoot"/> <property reference="webServiceUrlPattern"/> + <property reference="dao-impls"/> + <property reference="daos"/> + <property reference="daoInheritanceEnabled"/> + <property reference="enableDaoPropertiesCreateMethod"/> + + <!-- cartridge-property merge-point --> + + <condition name="enableTemplating">$enableTemplating.equalsIgnoreCase("true")</condition> + <condition name="daoInheritanceEnabled">$daoInheritanceEnabled.equalsIgnoreCase("true")</condition> + + <!-- condition merge-point--> + + <!-- cartridge-resource merge-point --> <!-- Entity Bean Templates --> @@ -250,6 +265,74 @@ </modelElements> </template> + <!-- DAO Templates --> + + <template + path="templates/ejb3/DaoLocal.vsl" + outputPattern="$generatedFile" + outlet="daos" + overwrite="true"> + <modelElements variable="entity"> + <modelElement> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade"/> + </modelElement> + </modelElements> + </template> + + <template + path="templates/ejb3/DaoBase.vsl" + outputPattern="$generatedFile" + outlet="daos" + overwrite="true"> + <modelElements variable="entity"> + <modelElement> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade"/> + </modelElement> + </modelElements> + </template> + + <template + path="templates/ejb3/DaoImpl.vsl" + outputPattern="$generatedFile" + outlet="daos" + overwrite="true"> + <modelElements variable="entity"> + <modelElement> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade"> + <property name="daoImplementationRequired">false</property> + </type> + </modelElement> + </modelElements> + </template> + + <template + path="templates/ejb3/DaoImpl.vsl" + outputPattern="$generatedFile" + outlet="dao-impls" + overwrite="false"> + <modelElements variable="entity"> + <modelElement> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade"> + <property name="daoImplementationRequired"/> + </type> + </modelElement> + </modelElements> + </template> + + <template + path="templates/ejb3/DaoDefaultException.vsl" + outputPattern="$generatedFile" + outlet="commons" + overwrite="true"> + <modelElements variable="entity"> + <modelElement> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade"/> + </modelElement> + </modelElements> + </template> + + <!-- Configuration Templates --> + <template path="templates/ejb3/config/ejb-jar.xml.vsl" outputPattern="META-INF/ejb-jar.xml" @@ -270,6 +353,9 @@ <modelElement variable="manageables"> <type name="org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityFacade"/> </modelElement> + <modelElement variable="entities"> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade"/> + </modelElement> </modelElements> </template> @@ -290,6 +376,9 @@ <modelElement variable="manageables"> <type name="org.andromda.cartridges.ejb3.metafacades.EJB3ManageableEntityFacade"/> </modelElement> + <modelElement variable="entities"> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade"/> + </modelElement> </modelElements> </template> @@ -439,6 +528,30 @@ </modelElements> </template> + <template + path="templates/ejb3/EmbeddedValue.vsl" + outputPattern="$generatedFile" + outlet="entity-beans" + overwrite="true"> + <modelElements variable="embeddedValue"> + <modelElement> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EmbeddedValueFacade"/> + </modelElement> + </modelElements> + </template> + + <template + path="templates/ejb3/EmbeddedValueImpl.vsl" + outputPattern="$generatedFile" + outlet="entity-impls" + overwrite="false"> + <modelElements variable="embeddedValue"> + <modelElement> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EmbeddedValueFacade"/> + </modelElement> + </modelElements> + </template> + <!-- CRUD Manageable Templates --> <template |