From: Vance K. <va...@us...> - 2006-01-17 03:20:20
|
User: vancek Date: 06/01/16 19:20:14 Modified: andromda-ejb3/src/main/resources/META-INF/andromda cartridge.xml Log: added interceptor templates, changed outputPattern value to use generatedFile variable for most templates, added condition for session bean local and remote interface generation, renamed Entity.vsl to EntityEmbeddable.vsl, renamed EntityImpl.vsl to Entity.vsl. Revision Changes Path 1.6 +72 -18 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.5 retrieving revision 1.6 diff -u -w -r1.5 -r1.6 --- cartridge.xml 10 Jan 2006 08:12:20 -0000 1.5 +++ cartridge.xml 17 Jan 2006 03:20:14 -0000 1.6 @@ -2,6 +2,7 @@ <!-- 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--> @@ -22,8 +23,8 @@ <!-- Entity Bean Templates --> <template - path="templates/ejb3/Entity.vsl" - outputPattern="{0}/{1}.java" + path="templates/ejb3/EntityEmbeddable.vsl" + outputPattern="$generatedFile" outlet="entity-beans" overwrite="true"> <modelElements variable="entity"> @@ -33,21 +34,27 @@ </modelElements> </template> + <!-- + Do not generated the entity implementation class if marked + to be an embeddable super class + --> <template - path="templates/ejb3/EntityImpl.vsl" - outputPattern="{0}/{1}Impl.java" + path="templates/ejb3/Entity.vsl" + outputPattern="$generatedFile" outlet="entity-impls" overwrite="false"> <modelElements variable="entity"> <modelElement> - <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade"/> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade"> + <property name="embeddableSuperclass">false</property> + </type> </modelElement> </modelElements> </template> <template path="templates/ejb3/EntityListener.vsl" - outputPattern="{0}/{1}Listener.java" + outputPattern="$generatedFile" outlet="entity-impls" overwrite="false"> <modelElements variable="entity"> @@ -66,8 +73,7 @@ outputOnEmptyElements="false"> <modelElements variable="entities"> <modelElement> - <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade"> - </type> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade"/> </modelElement> </modelElements> </template> @@ -76,7 +82,7 @@ <template path="templates/ejb3/SessionBean.vsl" - outputPattern="{0}/{1}Bean.java" + outputPattern="$generatedFile" outlet="session-beans" overwrite="true"> <modelElements variable="service"> @@ -88,33 +94,37 @@ <template path="templates/ejb3/SessionLocal.vsl" - outputPattern="{0}/{1}Local.java" + outputPattern="$generatedFile" outlet="session-beans" overwrite="true" generateEmptyFiles="true"> <modelElements variable="service"> <modelElement> - <type name="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade"/> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade"> + <property name="viewTypeLocal">true</property> + </type> </modelElement> </modelElements> </template> <template path="templates/ejb3/SessionRemote.vsl" - outputPattern="{0}/{1}Remote.java" + outputPattern="$generatedFile" outlet="session-beans" overwrite="true" generateEmptyFiles="true"> <modelElements variable="service"> <modelElement> - <type name="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade"/> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade"> + <property name="viewTypeRemote">true</property> + </type> </modelElement> </modelElements> </template> <template path="templates/ejb3/SessionBeanImpl.vsl" - outputPattern="{0}/{1}BeanImpl.java" + outputPattern="$generatedFile" outlet="session-impls" overwrite="false"> <modelElements variable="service"> @@ -126,7 +136,7 @@ <template path="templates/ejb3/SessionListener.vsl" - outputPattern="{0}/{1}Listener.java" + outputPattern="$generatedFile" outlet="session-impls" overwrite="false"> <modelElements variable="service"> @@ -162,11 +172,41 @@ </modelElements> </template> + <!-- + <template + path="templates/ejb3/ejb-jar.xml.vsl" + outputPattern="META-INF/ejb-jar.xml" + outlet="session-config" + overwrite="true" + outputToSingleFile="true" + outputOnEmptyElements="false"> + <modelElements variable="services"> + <modelElement> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade"/> + </modelElement> + </modelElements> + </template> + + <template + path="templates/ejb3/jboss.xml.vsl" + outputPattern="META-INF/jboss.xml" + outlet="session-config" + overwrite="true" + outputToSingleFile="true" + outputOnEmptyElements="false"> + <modelElements variable="services"> + <modelElement> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacade"/> + </modelElement> + </modelElements> + </template> + --> + <!-- Message Driven Bean Templates --> <template path="templates/ejb3/MessageDrivenBean.vsl" - outputPattern="{0}/{1}MDBBean.java" + outputPattern="$generatedFile" outlet="message-driven-beans" overwrite="true"> <modelElements variable="mdb"> @@ -178,7 +218,7 @@ <template path="templates/ejb3/MessageDrivenBeanImpl.vsl" - outputPattern="{0}/{1}MDBBeanImpl.java" + outputPattern="$generatedFile" outlet="message-driven-impls" overwrite="false"> <modelElements variable="mdb"> @@ -190,7 +230,7 @@ <template path="templates/ejb3/MessageDrivenListener.vsl" - outputPattern="{0}/{1}Listener.java" + outputPattern="$generatedFile" outlet="message-driven-impls" overwrite="false"> <modelElements variable="mdb"> @@ -200,6 +240,20 @@ </modelElements> </template> + <!-- Common Templates --> + + <template + path="templates/ejb3/Interceptor.vsl" + outputPattern="$generatedFile" + outlet="interceptor" + overwrite="false"> + <modelElements variable="interceptor"> + <modelElement> + <type name="org.andromda.cartridges.ejb3.metafacades.EJB3InterceptorFacade"/> + </modelElement> + </modelElements> + </template> + <!-- cartridge-template merge-point --> </cartridge> \ No newline at end of file |