From: Chad B. <cwb...@us...> - 2004-11-03 15:52:40
|
User: cwbrandon Date: 04/11/03 07:52:32 Modified: andromda-spring/src/test/uml SpringCartridgeTestModel.xml.zip andromda-spring/src/uml SpringMetafacadeModel.xml.zip andromda-spring/src/java/org/andromda/cartridges/spring/metafacades SpringServiceLogicImpl.java SpringGlobals.java andromda-spring/src/templates/spring SpringServiceImpl.vsl andromda-spring/src/META-INF andromda-cartridge.xml andromda-spring/src/test/expected cartridge-output.zip Added: andromda-spring/src/templates/spring SpringWebServiceDelegator.vsl Log: Fix support for spring + webservices Revision Changes Path 1.14 +59 -53 cartridges/andromda-spring/src/test/uml/SpringCartridgeTestModel.xml.zip <<Binary file>> 1.7 +49 -52 cartridges/andromda-spring/src/uml/SpringMetafacadeModel.xml.zip <<Binary file>> 1.2 +17 -0 cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringServiceLogicImpl.java Index: SpringServiceLogicImpl.java =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringServiceLogicImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- SpringServiceLogicImpl.java 5 Oct 2004 04:13:44 -0000 1.1 +++ SpringServiceLogicImpl.java 3 Nov 2004 15:52:30 -0000 1.2 @@ -177,4 +177,21 @@ { return (String)this.getConfiguredProperty("ejbJndiNamePrefix"); } + + /** + * @see org.andromda.cartridges.spring.metafacades.SpringService#getWebServiceDelegatorName() + */ + protected String handleGetWebServiceDelegatorName() + { + return this.getName() + SpringGlobals.WEB_SERVICE_DELEGATOR_SUFFIX; + } + + /** + * @see org.andromda.cartridges.spring.metafacades.SpringService#getFullyQualifiedWebServiceDelegatorName() + */ + protected String handleGetFullyQualifiedWebServiceDelegatorName() + { + return this.getFullyQualifiedName() + + SpringGlobals.WEB_SERVICE_DELEGATOR_SUFFIX; + } } \ No newline at end of file 1.2 +5 -0 cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringGlobals.java Index: SpringGlobals.java =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-spring/src/java/org/andromda/cartridges/spring/metafacades/SpringGlobals.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- SpringGlobals.java 5 Oct 2004 04:13:44 -0000 1.1 +++ SpringGlobals.java 3 Nov 2004 15:52:30 -0000 1.2 @@ -41,4 +41,9 @@ * The bean name target suffix */ final static String BEAN_NAME_TARGET_SUFFIX = "Target"; + + /** + * The service web service delegator. + */ + final static String WEB_SERVICE_DELEGATOR_SUFFIX = "WSDelegator"; } \ No newline at end of file 1.4 +3 -5 cartridges/andromda-spring/src/templates/spring/SpringServiceImpl.vsl Index: SpringServiceImpl.vsl =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-spring/src/templates/spring/SpringServiceImpl.vsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- SpringServiceImpl.vsl 19 Oct 2004 18:31:21 -0000 1.3 +++ SpringServiceImpl.vsl 3 Nov 2004 15:52:30 -0000 1.4 @@ -19,13 +19,11 @@ /** * @see ${service.fullyQualifiedName}#${operation.getSignature(false)} */ -#if ($operation.exceptionsPresent) - $operation.visibility $returnType.fullyQualifiedName $signature - throws $operation.exceptionList { -#else $operation.visibility $returnType.fullyQualifiedName $signature - { +#if ($operation.exceptionsPresent) + throws $operation.exceptionList #end + { //@todo implement $operation.visibility $returnType.fullyQualifiedName $signature #set ($returnTypeName = $operation.returnType.fullyQualifiedName) #if ($operation.returnTypePresent) 1.1 cartridges/andromda-spring/src/templates/spring/SpringWebServiceDelegator.vsl Index: SpringWebServiceDelegator.vsl =================================================================== package $service.packageName; #set ($generatedFile = "${stringUtils.replace($service.fullyQualifiedWebServiceDelegatorName,'.','/')}.java") /** * Web service delegator for <code>$service.fullyQualifiedName}</code>. * * @see $service.fullyQualifiedName */ public class $service.webServiceDelegatorName implements $service.fullyQualifiedName { /** * Gets an instance of <code>${service.fullyQualifiedName}</code> */ #set ($serviceGetter = "get${service.name}()") public final ${service.fullyQualifiedName} $serviceGetter { return ${serviceLocatorPackage}.ServiceLocator.instance().${serviceGetter}; } #foreach ($operation in $service.operations) /** * @see ${service.fullyQualifiedName}#${operation.getSignature(false)} */ $operation.visibility $operation.returnType.fullyQualifiedName $operation.signature #if ($operation.exceptionsPresent) throws $operation.exceptionList #end { #if (!$operation.returnTypePresent) ${serviceGetter}.${operation.name}(${operation.argumentNames}); #else return ${serviceGetter}.${operation.name}($operation.argumentNames); #end } #end } 1.5 +13 -1 cartridges/andromda-spring/src/META-INF/andromda-cartridge.xml Index: andromda-cartridge.xml =================================================================== RCS file: /cvsroot/andromda/cartridges/andromda-spring/src/META-INF/andromda-cartridge.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- andromda-cartridge.xml 31 Oct 2004 02:26:43 -0000 1.4 +++ andromda-cartridge.xml 3 Nov 2004 15:52:31 -0000 1.5 @@ -97,6 +97,16 @@ </template> <template + path="templates/spring/SpringWebServiceDelegator.vsl" + outputPattern="$generatedFile" + outlet="services" + overwrite="true"> + <modelElements variable="service"> + <modelElement stereotype="WebService"/> + </modelElements> + </template> + + <template path="templates/spring/SpringServiceBase.vsl" outputPattern="{0}/{1}Base.java" outlet="services" @@ -242,7 +252,7 @@ path="templates/spring/ejb/SpringSessionHome.vsl" outputPattern="$generatedFile" outlet="session-ejbs" - overwrite="true" + overwrite="false" required="false"> <modelElements variable="service"> <modelElement> @@ -272,6 +282,7 @@ outputPattern="META-INF/ejb-jar.xml" outlet="session-ejbs" overwrite="true" + required="false" outputToSingleFile="true"> <modelElements variable="services"> <modelElement> @@ -285,6 +296,7 @@ outputPattern="META-INF/jboss.xml" outlet="session-ejbs" overwrite="true" + required="false" outputToSingleFile="true"> <modelElements variable="services"> <modelElement> 1.26 +102 -98 cartridges/andromda-spring/src/test/expected/cartridge-output.zip <<Binary file>> |