svn commit: r611950 - in /incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap: SoapBindingConfiguration.java SoapBindingFactory.java

[dk...@apache.org]

Author: dkulp
Date: Mon Jan 14 14:06:06 2008
New Revision: 611950

URL: http://svn.apache.org/viewvc?rev=611950&view=rev
Log:
Add ability to control the generated binding name in the wsdl

Modified:
    incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
    incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java

Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java?rev=611950&r1=611949&r2=611950&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java Mon Jan 14 14:06:06 2008
@@ -18,10 +18,13 @@
  */
 package org.apache.cxf.binding.soap;
 
+import javax.xml.namespace.QName;
+
 import org.apache.cxf.binding.BindingConfiguration;
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.service.model.ServiceInfo;
 
 public class SoapBindingConfiguration extends BindingConfiguration {
     private SoapVersion soapVersion = Soap11.getInstance();
@@ -30,6 +33,8 @@
     private String transportURI = "http://schemas.xmlsoap.org/soap/http";
     private String defaultSoapAction = "";
     private boolean mtomEnabled;
+    private QName bindingName;
+    private String bindingNamePostfix = "SoapBinding";
 
     @Override
     public String getBindingId() {
@@ -92,6 +97,30 @@
 
     public void setMtomEnabled(boolean mtomEnabled) {
         this.mtomEnabled = mtomEnabled;
+    }
+    
+    public QName getBindingName(ServiceInfo si) {
+        if (bindingName == null) {
+            return new QName(si.getName().getNamespaceURI(),
+                             si.getName().getLocalPart() + bindingNamePostfix);
+        }
+        return bindingName;
+    }
+
+    public QName getBindingName() {
+        return bindingName;
+    }
+    
+    public void setBindingName(QName b) {
+        bindingName = b;
+    }
+    
+    public String getBindingNamePostfix() {
+        return bindingNamePostfix;
+    }
+    
+    public void setBindingNamePostfix(String b) {
+        bindingNamePostfix = b;
     }
     
 }

Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=611950&r1=611949&r2=611950&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java Mon Jan 14 14:06:06 2008
@@ -119,8 +119,7 @@
                                                    bindingid,
                                                    config.getVersion());
 
-        info.setName(new QName(si.getName().getNamespaceURI(),
-                               si.getName().getLocalPart() + "SoapBinding"));
+        info.setName(config.getBindingName(si));
         info.setStyle(config.getStyle());
         info.setTransportURI(config.getTransportURI());