[jboss-svn-commits] JBossWS SVN: r1058 - branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment

[jboss-svn-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2006-09-26 11:08:55 -0400 (Tue, 26 Sep 2006)
New Revision: 1058

Modified:
   branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java
Log:
Conformance (WebServiceProvider and WebService)

Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java	2006-09-26 15:08:20 UTC (rev 1057)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java	2006-09-26 15:08:55 UTC (rev 1058)
@@ -24,6 +24,7 @@
 
 import java.util.Map;
 
+import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding.ParameterStyle;
 import javax.management.ObjectName;
 import javax.xml.namespace.QName;
@@ -120,8 +121,13 @@
       // MUST carry a WebServiceProvider annotation
       WebServiceProvider anWebServiceProvider = (WebServiceProvider)sepClass.getAnnotation(WebServiceProvider.class);
       if (anWebServiceProvider == null)
-         throw new WebServiceException("Cannot obtain @WebServiceProvider annotaion from: " + sepClass.getName());
+         throw new WebServiceException("Cannot obtain @WebServiceProvider annotation from: " + sepClass.getName());
 
+      // 7.3 Conformance (WebServiceProvider and WebService): A class annotated with the WebServiceProvider
+      // annotation MUST NOT carry a WebService annotation
+      if (sepClass.isAnnotationPresent(WebService.class))
+         throw new WebServiceException("Provider cannot carry @WebService annotation: " + sepClass.getName());
+
       WSDLUtils wsdlUtils = WSDLUtils.getInstance();
 
       String name = wsdlUtils.getJustClassName(sepClass);