cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r612239 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Date Tue, 15 Jan 2008 21:58:24 GMT
Author: dkulp
Date: Tue Jan 15 13:58:22 2008
New Revision: 612239

URL: http://svn.apache.org/viewvc?rev=612239&view=rev
Log:
Merged revisions 611950 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r611950 | dkulp | 2008-01-14 17:06:06 -0500 (Mon, 14 Jan 2008) | 2 lines
  
  Add ability to control the generated binding name in the wsdl
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
    incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java

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

Modified: incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java?rev=612239&r1=612238&r2=612239&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
Tue Jan 15 13:58:22 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/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=612239&r1=612238&r2=612239&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Tue Jan 15 13:58:22 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());
 



Mime
View raw message