cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r719327 - in /cxf/trunk: rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ rt/frontend/jaxws/src/main/ja...
Date Thu, 20 Nov 2008 19:21:00 GMT
Author: dkulp
Date: Thu Nov 20 11:20:59 2008
New Revision: 719327

URL: http://svn.apache.org/viewvc?rev=719327&view=rev
Log:
[CXF-1923] More fixes related to cxf-1923.   Make sure SOAPBinding style attributes on methods
are actually honored in more cases.

Modified:
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
    cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Hello.java

Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=719327&r1=719326&r2=719327&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
(original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Thu Nov 20 11:20:59 2008
@@ -317,10 +317,19 @@
                 bindingStyle = sbi.getStyle();
             }
 
+            boolean hasRPC = false;
+            boolean hasDoc = false;
+            
             // Operation wide style, what to do with the mixed style/use?
             for (BindingOperationInfo boi : sbi.getOperations()) {
-                if (sbi.getStyle(boi.getOperationInfo()) != null) {
-                    bindingStyle = sbi.getStyle(boi.getOperationInfo());
+                String st = sbi.getStyle(boi.getOperationInfo());
+                if (st != null) {
+                    bindingStyle = st;
+                    if (SoapBindingConstants.BINDING_STYLE_RPC.equalsIgnoreCase(st)) {
+                        hasRPC = true;
+                    } else {
+                        hasDoc = true;
+                    }
                 }
                 if (boi.getUnwrappedOperation() == null) {
                     parameterStyle = SoapBindingConstants.PARAMETER_STYLE_BARE;
@@ -328,6 +337,10 @@
                     hasWrapped = true;
                 }
             }
+            if (hasRPC && hasDoc) {
+                throw new RuntimeException("WSI-BP prohibits RPC and Document style "
+                                           + "operations in same service.");
+            }
         } else {
             throw new RuntimeException("Can not initialize SoapBinding, BindingInfo is not
SoapBindingInfo");
         }

Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java?rev=719327&r1=719326&r2=719327&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
(original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
Thu Nov 20 11:20:59 2008
@@ -90,7 +90,7 @@
     }
     public void handleMessage(Message message) {
         if (isGET(message)) {
-            LOG.info("RPCInInterceptor skipped in HTTP GET method");
+            LOG.fine("RPCInInterceptor skipped in HTTP GET method");
             return;
         }
         DepthXMLStreamReader xmlReader = getXMLStreamReader(message);

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java?rev=719327&r1=719326&r2=719327&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
Thu Nov 20 11:20:59 2008
@@ -22,6 +22,7 @@
 
 import javax.xml.ws.soap.SOAPBinding;
 
+import org.apache.cxf.binding.soap.SoapBindingConfiguration;
 import org.apache.cxf.frontend.ClientFactoryBean;
 import org.apache.cxf.jaxws.binding.soap.JaxWsSoapBindingConfiguration;
 import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
@@ -36,6 +37,10 @@
         super(new JaxWsServiceFactoryBean());
     }
     
+    protected SoapBindingConfiguration createSoapBindingConfig() {
+        return new JaxWsSoapBindingConfiguration((JaxWsServiceFactoryBean)getServiceFactory());
+    }
+
     @Override
     public void setBindingId(String bind) {
         super.setBindingId(bind);

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java?rev=719327&r1=719326&r2=719327&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java
Thu Nov 20 11:20:59 2008
@@ -18,12 +18,15 @@
  */
 package org.apache.cxf.jaxws.binding.soap;
 
+import java.lang.reflect.Method;
+
 import javax.jws.soap.SOAPBinding;
 import javax.jws.soap.SOAPBinding.Style;
 import javax.jws.soap.SOAPBinding.Use;
 
 import org.apache.cxf.binding.soap.SoapBindingConfiguration;
 import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
+import org.apache.cxf.service.model.OperationInfo;
 
 /**
  * Introspects the SOAPBinding annotation to provide to construct
@@ -39,6 +42,14 @@
     public void setJaxWsServiceFactoryBean(JaxWsServiceFactoryBean b) {
         serviceFactory = b;
     }
+    
+    public String getStyle(OperationInfo op) {
+        Method m = op.getProperty("operation.method", Method.class);
+        if (m != null) {
+            return serviceFactory.isRPC(m) ? "rpc" : "document";
+        }
+        return getStyle();
+    }
 
     @Override
     public String getStyle() {

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=719327&r1=719326&r2=719327&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
(original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Thu Nov 20 11:20:59 2008
@@ -730,7 +730,11 @@
     
     @Override
     public Boolean isRPC(Method method) {
-        SOAPBinding ann = implInfo.getEndpointClass().getAnnotation(SOAPBinding.class);
+        SOAPBinding ann = method.getAnnotation(SOAPBinding.class);
+        if (ann != null) {
+            return ann.style().equals(SOAPBinding.Style.RPC);
+        }
+        ann = implInfo.getEndpointClass().getAnnotation(SOAPBinding.class);
         if (ann != null) {
             return ann.style().equals(SOAPBinding.Style.RPC);
         }

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=719327&r1=719326&r2=719327&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
(original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
Thu Nov 20 11:20:59 2008
@@ -353,7 +353,9 @@
         
         return hasAnnotation;
     }
-
+    protected SoapBindingConfiguration createSoapBindingConfig() {
+        return new SoapBindingConfiguration();
+    }
     protected BindingInfo createBindingInfo() {
         BindingFactoryManager mgr = bus.getExtension(BindingFactoryManager.class);
         String binding = bindingId;
@@ -370,7 +372,7 @@
         try {
             if (binding.contains("/soap")) {
                 if (bindingConfig == null) {
-                    bindingConfig = new SoapBindingConfiguration();
+                    bindingConfig = createSoapBindingConfig();
                 }
                 if (bindingConfig instanceof SoapBindingConfiguration
                     && !((SoapBindingConfiguration)bindingConfig).isSetStyle()) {

Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Hello.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Hello.java?rev=719327&r1=719326&r2=719327&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Hello.java (original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/Hello.java Thu Nov 20 11:20:59
2008
@@ -22,9 +22,10 @@
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 
-@SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.LITERAL)
+@SOAPBinding(use = SOAPBinding.Use.LITERAL)
 @WebService(name = "Hello", targetNamespace = "http://cxf.apache.org/systest/jaxws/")
 public interface Hello {
+    @SOAPBinding(style = SOAPBinding.Style.RPC)
     @WebMethod(operationName = "sayHi", exclude = false)
     String sayHi(String value);
 }



Mime
View raw message