cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r719344 - in /cxf/branches/2.0.x-fixes: ./ 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...
Date Thu, 20 Nov 2008 19:50:06 GMT
Author: dkulp
Date: Thu Nov 20 11:50:05 2008
New Revision: 719344

URL: http://svn.apache.org/viewvc?rev=719344&view=rev
Log:
Merged revisions 719332 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r719332 | dkulp | 2008-11-20 14:30:08 -0500 (Thu, 20 Nov 2008) | 9 lines
  
  Merged revisions 719327 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r719327 | dkulp | 2008-11-20 14:20:59 -0500 (Thu, 20 Nov 2008) | 2 lines
    
    [CXF-1923] More fixes related to cxf-1923.   Make sure SOAPBinding style attributes on
methods are actually honored in more cases.
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
    cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
    cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
    cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java
    cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
    cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/Hello.java
    cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
  (props changed)

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 20 11:50:05 2008
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327
 /incubator/cxf/trunk:434594-651668

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=719344&r1=719343&r2=719344&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Thu Nov 20 11:50:05 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 = SoapConstants.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/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java?rev=719344&r1=719343&r2=719344&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
Thu Nov 20 11:50:05 2008
@@ -91,7 +91,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/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java?rev=719344&r1=719343&r2=719344&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
Thu Nov 20 11:50:05 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/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java?rev=719344&r1=719343&r2=719344&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/soap/JaxWsSoapBindingConfiguration.java
Thu Nov 20 11:50:05 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/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=719344&r1=719343&r2=719344&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Thu Nov 20 11:50:05 2008
@@ -729,7 +729,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/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=719344&r1=719343&r2=719344&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
Thu Nov 20 11:50:05 2008
@@ -317,7 +317,9 @@
         
         return hasAnnotation;
     }
-
+    protected SoapBindingConfiguration createSoapBindingConfig() {
+        return new SoapBindingConfiguration();
+    }
     protected BindingInfo createBindingInfo() {
         BindingFactoryManager mgr = bus.getExtension(BindingFactoryManager.class);
         String binding = bindingId;
@@ -334,7 +336,7 @@
         try {
             if ("http://schemas.xmlsoap.org/soap/".equals(binding)) {
                 if (bindingConfig == null) {
-                    bindingConfig = new SoapBindingConfiguration();
+                    bindingConfig = createSoapBindingConfig();
                 }
                 if (bindingConfig instanceof SoapBindingConfiguration
                     && !((SoapBindingConfiguration)bindingConfig).isSetStyle()) {

Modified: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/Hello.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/Hello.java?rev=719344&r1=719343&r2=719344&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/Hello.java
(original)
+++ cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/Hello.java
Thu Nov 20 11:50:05 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);
 }

Propchange: cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 20 11:50:05 2008
@@ -1 +1 @@
-/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java:712600,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,719296,719300-719301,719303,719308
+/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java:712600,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,719296,719300-719301,719303,719308,719332



Mime
View raw message