svn commit: r532888 - /incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java

[gawor]

Author: gawor
Date: Thu Apr 26 15:11:14 2007
New Revision: 532888

URL: http://svn.apache.org/viewvc?view=rev&rev=532888
Log:
serviceName and portName attributes cannot be specified on SEI so don't look 
for them there

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?view=diff&rev=532888&r1=532887&r2=532888
==============================================================================
--- 
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
 Thu Apr 26 15:11:14 2007
@@ -96,13 +96,10 @@
         String serviceName = null;
         String namespace = null;
 
-        for (WebService service : wsAnnotations) {
-            if (!StringUtils.isEmpty(service.serviceName()) && serviceName == 
null) {
-                serviceName = service.serviceName();
-            }
-            if (!StringUtils.isEmpty(service.targetNamespace()) && namespace 
== null) {
-                namespace = service.targetNamespace();
-            }
+        // serviceName cannot be specified on SEI so check impl class only
+        if (wsAnnotations.size() > 0) {
+            serviceName = wsAnnotations.get(0).serviceName();
+            namespace = wsAnnotations.get(0).targetNamespace();
         }
         
         if ((serviceName == null || namespace == null) 
@@ -130,21 +127,14 @@
     public QName getEndpointName() {
         String portName = null;
         String namespace = null;
-        for (WebService service : wsAnnotations) {
-            if (!StringUtils.isEmpty(service.portName()) && portName == null) {
-                portName = service.portName();
-            }
-            if (!StringUtils.isEmpty(service.targetNamespace()) && namespace 
== null) {
-                namespace = service.targetNamespace();
-            }
-            
-            if (!StringUtils.isEmpty(portName)
-                && !StringUtils.isEmpty(namespace)) {
-                break;
-            }
+
+        // portName cannot be specified on SEI so check impl class only
+        if (wsAnnotations.size() > 0) {
+            portName = wsAnnotations.get(0).portName();
+            namespace = wsAnnotations.get(0).targetNamespace();
         }
-        if ((StringUtils.isEmpty(portName) 
-            || StringUtils.isEmpty(namespace)) 
+
+        if ((portName == null || namespace == null)
             && wsProviderAnnotation != null) {
             portName = wsProviderAnnotation.portName();
             namespace = wsProviderAnnotation.targetNamespace();