cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r569755 - /incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
Date Sun, 26 Aug 2007 02:05:37 GMT
Author: dkulp
Date: Sat Aug 25 19:05:36 2007
New Revision: 569755

URL: http://svn.apache.org/viewvc?rev=569755&view=rev
Log:
If @WebService annotation comes from an interface not pulled in from a endpointInterface annotation,
it should allow the extra attributes.

Modified:
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java?rev=569755&r1=569754&r2=569755&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
Sat Aug 25 19:05:36 2007
@@ -259,7 +259,9 @@
             cls = cls.getSuperclass();
         }
         String sei = getImplementorClassName();
+        boolean seiFromWsAnnotation = true;
         if (StringUtils.isEmpty(sei)) {
+            seiFromWsAnnotation = false;
             sei = getWSInterfaceName(implementorClass);                
         }
         if (!StringUtils.isEmpty(sei)) {
@@ -272,9 +274,10 @@
             if (null == seiAnnotation) {
                 throw new WebServiceException(BUNDLE.getString("SEI_WITHOUT_WEBSERVICE_ANNOTATION_EXC"));
             }
-            if (!StringUtils.isEmpty(seiAnnotation.portName())
+            if (seiFromWsAnnotation &&
+                (!StringUtils.isEmpty(seiAnnotation.portName())
                 || !StringUtils.isEmpty(seiAnnotation.serviceName())
-                || !StringUtils.isEmpty(seiAnnotation.endpointInterface())) {
+                || !StringUtils.isEmpty(seiAnnotation.endpointInterface()))) {
                 String expString = BUNDLE.getString("ILLEGAL_ATTRIBUTE_IN_SEI_ANNOTATION_EXC");
                 throw new WebServiceException(expString);
             }



Mime
View raw message