From: Vance K. <va...@us...> - 2006-04-11 15:48:57
|
User: vancek Date: 06/04/11 08:48:56 Modified: andromda-ejb3/src/main/resources/templates/ejb3/config ejb-jar.xml.vsl Log: added xml namesapce/schema properties to ejb-jar root element reverted back to using bean names for ejb-name element fixed message-driven bean activation-config elements Revision Changes Path 1.3 +41 -29 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/ejb-jar.xml.vsl Index: ejb-jar.xml.vsl =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/config/ejb-jar.xml.vsl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- ejb-jar.xml.vsl 16 Mar 2006 02:09:32 -0000 1.2 +++ ejb-jar.xml.vsl 11 Apr 2006 15:48:56 -0000 1.3 @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="${xmlEncoding}"?> -<!-- -<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" - "http://java.sun.com/dtd/ejb-jar_2_0.dtd"> ---> -<ejb-jar version="3.0"> +<ejb-jar + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" + version="3.0"> <description><![CDATA[No Description.]]></description> <display-name>Generated by AndroMDA EJB3 Cartridge</display-name> @@ -17,14 +18,14 @@ $service.getDocumentation(" ", 64, false) ]]> </description> - <ejb-name>${service.fullyQualifiedServiceName}</ejb-name> + <ejb-name>${service.serviceName}</ejb-name> #**##if ($service.viewTypeRemote) <remote>${service.fullyQualifiedServiceRemoteInterfaceName}</remote> #**##end #**##if ($service.viewTypeLocal) <local>${service.fullyQualifiedServiceLocalInterfaceName}</local> #**##end - <ejb-class>${service.fullyQualifiedServiceImplementationName}</ejb-class> + <ejb-class>${service.fullyQualifiedServiceName}</ejb-class> <session-type>${service.type}</session-type> <transaction-type>Container</transaction-type> #**##foreach($envEntry in $service.getEnvironmentEntries(true)) @@ -44,7 +45,7 @@ $manageable.getDocumentation(" ", 64, false) ]]> </description> - <ejb-name>${manageable.fullyQualifiedManageableServiceName}</ejb-name> + <ejb-name>${manageable.manageableServiceName}</ejb-name> <remote>${manageable.fullyQualifiedManageableServiceName}</remote> <ejb-class>${manageable.fullyQualifiedManageableServiceBaseName}</ejb-class> <session-type>Stateless</session-type> @@ -59,23 +60,32 @@ $mdb.getDocumentation(" ", 64, false) ]]> </description> - <ejb-name>${mdb.fullyQualifiedMessageDrivenName}</ejb-name> + <ejb-name>${mdb.messageDrivenName}</ejb-name> <ejb-class>${mdb.fullyQualifiedMessageDrivenImplementationName}</ejb-class> <transaction-type>Container</transaction-type> -#**##if ($stringUtils.isNotBlank($mdb.messageSelector)) - <message-selector> - <![CDATA[${mdb.messageSelector}]]> - </message-selector> -#**##end + <message-destination-type>${mdb.destinationType}</message-destination-type> +#**##if ($mdb.transactionManagementBean || $stringUtils.isNotBlank($mdb.messageSelector) || $mdb.destinationTypeTopic) + <activation-config> #**##if ($mdb.transactionManagementBean) - <acknowledge-mode>${mdb.acknowledgeMode}</acknowledge-mode> + <activation-config-property> + <activation-config-property-name>acknowledgeMode</activation-config-property-name> + <activation-config-property-value>${mdb.acknowledgeMode}</activation-config-property-value> + </activation-config-property> +#* *##end +#* *##if ($stringUtils.isNotBlank($mdb.messageSelector)) + <activation-config-property> + <activation-config-property-name>messageSelector</activation-config-property-name> + <activation-config-property-value><![CDATA[${mdb.messageSelector}]]></activation-config-property-value> + </activation-config-property> #**##end - <message-driven-destination> - <destination-type>${mdb.destinationType}</destination-type> #**##if ($mdb.destinationTypeTopic) - <subscription-durability>${mdb.subscriptionDurability}</subscription-durability> + <activation-config-property> + <activation-config-property-name>subscriptionDurability</activation-config-property-name> + <activation-config-property-value>${mdb.subscriptionDurability}</activation-config-property-value> + </activation-config-property> +#* *##end + </activation-config> #**##end - </message-driven-destination> #**##if ($stringUtils.isNotBlank($mdb.runAs)) <security-identity> <run-as> @@ -118,7 +128,7 @@ #**##set ($interceptors = $service.interceptorReferences) #**##if ($collectionUtils.size($interceptors) >= 1 || $service.listenerEnabled) <interceptor-binding> - <ejb-name>${service.fullyQualifiedServiceName}</ejb-name> + <ejb-name>${service.serviceName}</ejb-name> #* *##if ($service.listenerEnabled) <interceptor-class>${service.fullyQualifiedServiceListenerName}</interceptor-class> #* *##end @@ -139,10 +149,11 @@ #* *##set ($interceptors = $operation.interceptorReferences) #* *##if ($collectionUtils.size($interceptors) >= 1) <interceptor-binding> - <ejb-name>${service.fullyQualifiedServiceName}</ejb-name> + <ejb-name>${service.serviceName}</ejb-name> #* *##foreach ($interceptor in $interceptors) <interceptor-class>${interceptor.fullyQualifiedName}</interceptor-class> #* *##end + <method> <method-name>${operation.name}</method-name> #* *##if (!$operation.arguments.empty) <method-params> @@ -151,6 +162,7 @@ #* *##end </method-params> #* *##end + </method> #* *##if ($operation.excludeClassInterceptors) <exclude-class-interceptors/> #* *##end @@ -168,7 +180,7 @@ #**##set ($interceptors = $mdb.interceptorReferences) #**##if ($collectionUtils.size($interceptors) >= 1 || $mdb.listenerEnabled) <interceptor-binding> - <ejb-name>${mdb.fullyQualifiedMessageDrivenName}</ejb-name> + <ejb-name>${mdb.messageDrivenName}</ejb-name> #* *##if ($mdb.listenerEnabled) <interceptor-class>${mdb.fullyQualifiedMessageDrivenListenerName}</interceptor-class> #* *##end |