geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r595185 - /geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoJaxWsImplementorInfo.java
Date Thu, 15 Nov 2007 02:22:27 GMT
Author: gawor
Date: Wed Nov 14 18:22:26 2007
New Revision: 595185

URL: http://svn.apache.org/viewvc?rev=595185&view=rev
Log:
SEI in deployment descriptor can override the WebService.endpointInterface attribute only
if the attribute is not set

Modified:
    geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoJaxWsImplementorInfo.java

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoJaxWsImplementorInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoJaxWsImplementorInfo.java?rev=595185&r1=595184&r2=595185&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoJaxWsImplementorInfo.java
(original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoJaxWsImplementorInfo.java
Wed Nov 14 18:22:26 2007
@@ -35,16 +35,20 @@
             this.bindingURI = JAXWSUtils.getBindingURI(portInfo.getProtocolBinding());
         }
         
-        String sei = portInfo.getServiceEndpointInterfaceName();
-        if (sei != null && sei.trim().length() > 0) {
-            try {
-                this.seiClass = loader.loadClass(sei.trim());
-            } catch (ClassNotFoundException ex) {
-                throw new WebServiceException("Failed to load SEI class: " + sei);
+        // overwrite seiClass only if WebService.endpointInterface is not set
+        if (super.getSEIClass() == null) {
+            String sei = portInfo.getServiceEndpointInterfaceName();
+            if (sei != null && sei.trim().length() > 0) {
+                try {
+                    this.seiClass = loader.loadClass(sei.trim());
+                } catch (ClassNotFoundException ex) {
+                    throw new WebServiceException("Failed to load SEI class: " + sei);
+                }
             }
         }
     }
     
+    @Override
     public String getBindingType() {
         if (this.bindingURI != null) {
             return this.bindingURI;
@@ -53,6 +57,7 @@
         }
     }
     
+    @Override
     public Class<?> getSEIClass() {
         return (this.seiClass != null) ? this.seiClass : super.getSEIClass();        
     }



Mime
View raw message