You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/06/04 23:31:09 UTC
svn commit: r1489628 -
/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
Author: dkulp
Date: Tue Jun 4 21:30:56 2013
New Revision: 1489628
URL: http://svn.apache.org/r1489628
Log:
One of these commits, I'll actually fix something without breaking something else......
Modified:
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1489628&r1=1489627&r2=1489628&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Tue Jun 4 21:30:56 2013
@@ -492,11 +492,15 @@ public class WSDLServiceBuilder {
bi = wFactory.createBindingInfo(service, binding, ns.toString());
copyExtensors(bi, binding.getExtensibilityElements());
copyExtensionAttributes(bi, binding);
- } else if (factory instanceof AbstractBindingFactory) {
- bi = ((AbstractBindingFactory)factory).createBindingInfo(service, ns.toString(), null);
}
if (bi == null) {
- bi = new BindingInfo(service, ns.toString());
+ boolean onlyExtensors = false;
+ if (factory instanceof AbstractBindingFactory) {
+ bi = ((AbstractBindingFactory)factory).createBindingInfo(service, ns.toString(), null);
+ onlyExtensors = true;
+ } else {
+ bi = new BindingInfo(service, ns.toString());
+ }
bi.setName(binding.getQName());
copyExtensors(bi, binding.getExtensibilityElements());
copyExtensionAttributes(bi, binding);
@@ -513,13 +517,21 @@ public class WSDLServiceBuilder {
if (bop.getBindingOutput() != null) {
outName = bop.getBindingOutput().getName();
}
- BindingOperationInfo bop2 = bi.buildOperation(new QName(binding.getQName().getNamespaceURI(),
- bop.getName()), inName, outName);
+ BindingOperationInfo bop2 = null;
+ if (onlyExtensors) {
+ bop2 = bi.getOperation(new QName(binding.getQName().getNamespaceURI(),
+ bop.getName()));
+ } else {
+ bop2 = bi.buildOperation(new QName(binding.getQName().getNamespaceURI(),
+ bop.getName()), inName, outName);
+ if (bop2 != null) {
+ bi.addOperation(bop2);
+ }
+ }
if (bop2 != null) {
copyExtensors(bop2, bop.getExtensibilityElements());
copyExtensionAttributes(bop2, bop);
- bi.addOperation(bop2);
if (bop.getBindingInput() != null) {
copyExtensors(bop2.getInput(), bop.getBindingInput().getExtensibilityElements());
copyExtensionAttributes(bop2.getInput(), bop.getBindingInput());