[Andromda-cvs] SF.net SVN: andromda:[14707] trunk/cartridges/andromda-ejb3/src

[<bob...@us...>]

Revision: 14707
          http://andromda.svn.sourceforge.net/andromda/?rev=14707&view=rev
Author:   bobfields
Date:     2010-12-13 05:45:51 +0000 (Mon, 13 Dec 2010)

Log Message:
-----------
EJB-119 Fix @WebService annotation to be JAX-WS compliant

Modified Paths:
--------------
    trunk/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanImpl.vsl
    trunk/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/WebServiceInterface.vsl
    trunk/cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip

Modified: trunk/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanImpl.vsl
===================================================================
--- trunk/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanImpl.vsl	2010-12-12 19:21:28 UTC (rev 14706)
+++ trunk/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/SessionBeanImpl.vsl	2010-12-13 05:45:51 UTC (rev 14707)
@@ -33,10 +33,10 @@
 #**##end
 #end
 #if ($service.webServiceEnabled)
-@javax.jws.WebService(endpointInterface = "${service.fullyQualifiedWebServiceInterfaceName}")
+@javax.jws.WebService(endpointInterface = "${service.fullyQualifiedWebServiceInterfaceName}", serviceName = "${service.qName}")
 #else
 // Uncomment to enable webservices for ${service.serviceName}
-// @javax.jws.WebService(endpointInterface = "${service.fullyQualifiedWebServiceInterfaceName}")
+// @javax.jws.WebService(endpointInterface = "${service.fullyQualifiedWebServiceInterfaceName}", serviceName = "${service.qName}")
 #end
 public class ${service.serviceName}
     extends ${service.fullyQualifiedServiceBaseName}

Modified: trunk/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/WebServiceInterface.vsl
===================================================================
--- trunk/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/WebServiceInterface.vsl	2010-12-12 19:21:28 UTC (rev 14706)
+++ trunk/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/WebServiceInterface.vsl	2010-12-13 05:45:51 UTC (rev 14707)
@@ -9,7 +9,7 @@
  * Web service interface for the ${service.serviceName} session bean.
  *
  */
-@javax.jws.WebService(targetNamespace = "${service.namespace}", serviceName = "${service.qName}")
+@javax.jws.WebService(targetNamespace = "${service.namespace}")
 @javax.jws.soap.SOAPBinding(style = javax.jws.soap.SOAPBinding.Style.${stringUtils.upperCase($service.style)}, use = javax.jws.soap.SOAPBinding.Use.${stringUtils.upperCase($service.use)}, parameterStyle = javax.jws.soap.SOAPBinding.ParameterStyle.${stringUtils.upperCase($service.parameterStyle)})
 #if ($stringUtils.equals(${persistenceContainerName}, "jboss"))
 @org.jboss.ws.annotation.PortComponent(contextRoot = "${webServiceContextRoot}", urlPattern="${webServiceUrlPattern}/${service.qName}/*")

Modified: trunk/cartridges/andromda-ejb3/src/test/expected/cartridge-output.zip
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.