Author: keith
Date: Fri Aug  8 04:12:18 2008
New Revision: 20602
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=20602

Log:
Fixing Mashup-1086


Modified:
   trunk/mashup/java/modules/core/src/org/wso2/mashup/deployers/DBDeployer.java
   
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java

Modified: 
trunk/mashup/java/modules/core/src/org/wso2/mashup/deployers/DBDeployer.java
URL: 
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/core/src/org/wso2/mashup/deployers/DBDeployer.java?rev=20602&r1=20601&r2=20602&view=diff
==============================================================================
--- 
trunk/mashup/java/modules/core/src/org/wso2/mashup/deployers/DBDeployer.java    
    (original)
+++ 
trunk/mashup/java/modules/core/src/org/wso2/mashup/deployers/DBDeployer.java    
    Fri Aug  8 04:12:18 2008
@@ -16,6 +16,7 @@
 package org.wso2.mashup.deployers;
 
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.axis2.transport.http.util.RESTUtil;
 import org.apache.axis2.transport.http.HTTPConstants;
@@ -422,15 +423,17 @@
                 prefix = transportInName.toUpperCase();
             }
 
-            // Creates a default SOAP 1.1 endpoint
-            AxisEndpoint soap11Endpoint = new AxisEndpoint();
-            String soap11EndpointName =
-                    prefix + WSDL2Constants.DEFAULT_SOAP11_ENDPOINT_NAME;
-            soap11Endpoint.setName(soap11EndpointName);
-            soap11Endpoint.setBinding(soap11Binding);
-            soap11Endpoint.setParent(axisService);
-            soap11Endpoint.setTransportInDescription(transportInName);
-            axisService.addEndpoint(soap11EndpointName, soap11Endpoint);
+            if (!Constants.TRANSPORT_MAIL.equalsIgnoreCase(transportInName)) {
+                // Creates a default SOAP 1.1 endpoint
+                AxisEndpoint soap11Endpoint = new AxisEndpoint();
+                String soap11EndpointName =
+                        prefix + WSDL2Constants.DEFAULT_SOAP11_ENDPOINT_NAME;
+                soap11Endpoint.setName(soap11EndpointName);
+                soap11Endpoint.setBinding(soap11Binding);
+                soap11Endpoint.setParent(axisService);
+                soap11Endpoint.setTransportInDescription(transportInName);
+                axisService.addEndpoint(soap11EndpointName, soap11Endpoint);
+            }
 
             // Creates a default SOAP 1.2 endpoint
             AxisEndpoint soap12Endpoint = new AxisEndpoint();

Modified: 
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
URL: 
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java?rev=20602&r1=20601&r2=20602&view=diff
==============================================================================
--- 
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
   (original)
+++ 
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
   Fri Aug  8 04:12:18 2008
@@ -19,6 +19,7 @@
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.deployment.Deployer;
@@ -684,15 +685,17 @@
                 prefix = transportInName.toUpperCase();
             }
 
-            // Creates a default SOAP 1.1 endpoint
-            AxisEndpoint soap11Endpoint = new AxisEndpoint();
-            String soap11EndpointName =
-                    prefix + WSDL2Constants.DEFAULT_SOAP11_ENDPOINT_NAME;
-            soap11Endpoint.setName(soap11EndpointName);
-            soap11Endpoint.setBinding(soap11Binding);
-            soap11Endpoint.setParent(axisService);
-            soap11Endpoint.setTransportInDescription(transportInName);
-            axisService.addEndpoint(soap11EndpointName, soap11Endpoint);
+            if (!Constants.TRANSPORT_MAIL.equalsIgnoreCase(transportInName)) {
+                // Creates a default SOAP 1.1 endpoint
+                AxisEndpoint soap11Endpoint = new AxisEndpoint();
+                String soap11EndpointName =
+                        prefix + WSDL2Constants.DEFAULT_SOAP11_ENDPOINT_NAME;
+                soap11Endpoint.setName(soap11EndpointName);
+                soap11Endpoint.setBinding(soap11Binding);
+                soap11Endpoint.setParent(axisService);
+                soap11Endpoint.setTransportInDescription(transportInName);
+                axisService.addEndpoint(soap11EndpointName, soap11Endpoint);
+            }
 
             // Creates a default SOAP 1.2 endpoint
             AxisEndpoint soap12Endpoint = new AxisEndpoint();

_______________________________________________
Mashup-dev mailing list
[email protected]
http://mailman.wso2.org/cgi-bin/mailman/listinfo/mashup-dev

Reply via email to