svn commit: r531710 - in /incubator/cxf/trunk/rt: bindings/soap/src/main/java/org/apache/cxf/binding/soap/ frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/

[gawor]

Author: gawor
Date: Mon Apr 23 20:41:33 2007
New Revision: 531710

URL: http://svn.apache.org/viewvc?view=rev&rev=531710
Log:
move constants to soap factory classes

Modified:
    
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
    
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
    
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/BindingID.java

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?view=diff&rev=531710&r1=531709&r2=531710
==============================================================================
--- 
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 Apr 23 20:41:33 2007
@@ -78,6 +78,9 @@
 
 public class SoapBindingFactory extends AbstractBindingFactory {
 
+    public static final String SOAP_11_BINDING = 
"http://schemas.xmlsoap.org/wsdl/soap/";;
+    public static final String SOAP_12_BINDING = 
"http://schemas.xmlsoap.org/wsdl/soap12/";;
+    
     public static final String MESSAGE_PROCESSING_DISABLED = 
"disable.header.processing";
     
     private boolean mtomEnabled = true;

Modified: 
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java?view=diff&rev=531710&r1=531709&r2=531710
==============================================================================
--- 
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
 (original)
+++ 
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
 Mon Apr 23 20:41:33 2007
@@ -65,9 +65,15 @@
 
 public class SoapTransportFactory extends AbstractTransportFactory implements 
DestinationFactory,
     WSDLEndpointFactory, ConduitInitiator {
+    
+    public static final String SOAP_11_HTTP_BINDING = 
"http://schemas.xmlsoap.org/soap/http";;
+    public static final String SOAP_12_HTTP_BINDING = 
"http://www.w3.org/2003/05/soap/bindings/HTTP/";;
+    
     public static final String TRANSPORT_ID = 
"http://schemas.xmlsoap.org/soap/";;
+    
     private Bus bus;
     private Collection<String> activationNamespaces;
+    
     public SoapTransportFactory() {
         super();
     }

Modified: 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/BindingID.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/BindingID.java?view=diff&rev=531710&r1=531709&r2=531710
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/BindingID.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/BindingID.java
 Mon Apr 23 20:41:33 2007
@@ -20,21 +20,18 @@
 
 import javax.xml.ws.soap.SOAPBinding;
 
+import org.apache.cxf.binding.soap.SoapBindingFactory;
+import org.apache.cxf.binding.soap.SoapTransportFactory;
+
 public final class BindingID {
-    
-    private static final String SOAP_11 = 
"http://schemas.xmlsoap.org/wsdl/soap/";;
-    private static final String SOAP_12 = 
"http://schemas.xmlsoap.org/wsdl/soap12/";;
-    
-    private static final String SOAP_11_HTTP_BINDING = 
"http://schemas.xmlsoap.org/soap/http";;
-    private static final String SOAP_12_HTTP_BINDING = 
"http://www.w3.org/2003/05/soap/bindings/HTTP/";;
-    
+           
     private BindingID() {
     }
     
     public static String getJaxwsBindingID(String transportID) {
-        if (SOAP_11_HTTP_BINDING.equals(transportID)) {
+        if (SoapTransportFactory.SOAP_11_HTTP_BINDING.equals(transportID)) {
             return SOAPBinding.SOAP11HTTP_BINDING;
-        } else if (SOAP_12_HTTP_BINDING.equals(transportID)) {
+        } else if 
(SoapTransportFactory.SOAP_12_HTTP_BINDING.equals(transportID)) {
             return SOAPBinding.SOAP12HTTP_BINDING;
         } else {
             return transportID;
@@ -44,10 +41,10 @@
     public static String getBindingID(String jaxwsBindingID) {
         if (SOAPBinding.SOAP11HTTP_BINDING.equals(jaxwsBindingID) 
                 || SOAPBinding.SOAP11HTTP_MTOM_BINDING.equals(jaxwsBindingID)) 
{
-            return SOAP_11;
+            return SoapBindingFactory.SOAP_11_BINDING;
         } else if (SOAPBinding.SOAP12HTTP_BINDING.equals(jaxwsBindingID)
                 || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(jaxwsBindingID)) 
{
-            return SOAP_12;
+            return SoapBindingFactory.SOAP_12_BINDING;
         } else {
             return jaxwsBindingID;
         }