You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2013/10/30 16:18:20 UTC
svn commit: r1537127 - in /cxf/branches/2.7.x-fixes: ./
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Author: asoldano
Date: Wed Oct 30 15:18:20 2013
New Revision: 1537127
URL: http://svn.apache.org/r1537127
Log:
Merged revisions 1537121 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1537121 | asoldano | 2013-10-30 15:58:53 +0100 (Wed, 30 Oct 2013) | 2 lines
[CXF-5341] Committing patch from Rebecca Searls, thanks!
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1537121
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java?rev=1537127&r1=1537126&r2=1537127&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java Wed Oct 30 15:18:20 2013
@@ -263,7 +263,8 @@ public class JaxWsEndpointImpl extends E
Iterator<ExtensibilityElement> extensionElements = bindingExtensors.iterator();
while (extensionElements.hasNext()) {
ExtensibilityElement ext = extensionElements.next();
- if (ext instanceof UnknownExtensibilityElement && Boolean.TRUE.equals(ext.getRequired())) {
+ if (ext instanceof UnknownExtensibilityElement && Boolean.TRUE.equals(ext.getRequired())
+ && this.wsFeatures != null) {
for (WebServiceFeature feature : this.wsFeatures) {
if (feature instanceof RespectBindingFeature && feature.isEnabled()) {
Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=1537127&r1=1537126&r2=1537127&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Wed Oct 30 15:18:20 2013
@@ -42,6 +42,8 @@ import javax.xml.ws.AsyncHandler;
import javax.xml.ws.BindingType;
import javax.xml.ws.FaultAction;
import javax.xml.ws.Provider;
+import javax.xml.ws.RespectBinding;
+import javax.xml.ws.RespectBindingFeature;
import javax.xml.ws.Service;
import javax.xml.ws.WebFault;
import javax.xml.ws.WebServiceFeature;
@@ -189,6 +191,15 @@ public class JaxWsServiceFactoryBean ext
}
+ RespectBinding respectBinding = implInfo.getImplementorClass().getAnnotation(
+ RespectBinding.class);
+ if (respectBinding == null && serviceClass != null) {
+ respectBinding = serviceClass.getAnnotation(RespectBinding.class);
+ }
+ if (respectBinding != null) {
+ features.add(new RespectBindingFeature(respectBinding.enabled()));
+ }
+
if (features.size() > 0) {
wsFeatures = features;
if (setWsFeatures != null) {