Author: ruwan
Date: Tue Oct 23 02:28:30 2007
New Revision: 587429
URL: http://svn.apache.org/viewvc?rev=587429&view=rev
Log:
Fixing an issue with soap being converted to soap11 and soap12
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java?rev=587429&r1=587428&r2=587429&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
Tue Oct 23 02:28:30 2007
@@ -171,11 +171,11 @@
endpoint.setFormat(SynapseConstants.FORMAT_POX);
} else if (forceValue.equals(SynapseConstants.FORMAT_SOAP11)) {
- endpoint.setForceSOAP(true);
+ endpoint.setForceSOAP11(true);
endpoint.setFormat(SynapseConstants.FORMAT_SOAP11);
} else if (forceValue.equals(SynapseConstants.FORMAT_SOAP12)) {
- endpoint.setForceSOAP(true);
+ endpoint.setForceSOAP12(true);
endpoint.setFormat(SynapseConstants.FORMAT_SOAP12);
} else {
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java?rev=587429&r1=587428&r2=587429&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
Tue Oct 23 02:28:30 2007
@@ -119,8 +119,10 @@
} else if (endpt.isForcePOX()) {
address.addAttribute(fac.createOMAttribute("format", null, "pox"));
- } else if (endpt.isForceSOAP()) {
+ } else if (endpt.isForceSOAP11()) {
address.addAttribute(fac.createOMAttribute("format", null,
"soap11"));
+ } else if (endpt.isForceSOAP12()) {
+ address.addAttribute(fac.createOMAttribute("format", null,
"soap12"));
}
if (endpt.isUseSwa()) {
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java?rev=587429&r1=587428&r2=587429&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
Tue Oct 23 02:28:30 2007
@@ -216,11 +216,11 @@
endpointDefinition.setFormat(SynapseConstants.FORMAT_POX);
} else if (SynapseConstants.FORMAT_SOAP11.equals(forceValue)) {
- endpointDefinition.setForceSOAP(true);
+ endpointDefinition.setForceSOAP11(true);
endpointDefinition.setFormat(SynapseConstants.FORMAT_SOAP11);
} else if (SynapseConstants.FORMAT_SOAP12.equals(forceValue)) {
- endpointDefinition.setForceSOAP(true);
+ endpointDefinition.setForceSOAP12(true);
endpointDefinition.setFormat(SynapseConstants.FORMAT_SOAP12);
} else {
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java?rev=587429&r1=587428&r2=587429&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
Tue Oct 23 02:28:30 2007
@@ -121,9 +121,11 @@
} else if (endpointDefinition.isForcePOX()) {
wsdlElement.addAttribute(fac.createOMAttribute("format", null,
"pox"));
- } else if (endpointDefinition.isForceSOAP()) {
+ } else if (endpointDefinition.isForceSOAP11()) {
wsdlElement.addAttribute(fac.createOMAttribute("format", null,
"soap11"));
- }
+ } else if (endpointDefinition.isForceSOAP12()) {
+ wsdlElement.addAttribute(fac.createOMAttribute("format", null,
"soap12"));
+ }
int isEnableStatistics = endpointDefinition.getStatisticsState();
String statisticsValue = null;
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?rev=587429&r1=587428&r2=587429&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
Tue Oct 23 02:28:30 2007
@@ -45,9 +45,7 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.synapse.util.UUIDGenerator;
import org.apache.synapse.util.MessageHelper;
-import org.apache.axiom.attachments.Attachments;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Policy;
@@ -105,7 +103,8 @@
"] [ mtom = " + endpoint.isUseMTOM() +
"] [ swa = " + endpoint.isUseSwa() +
"] [ format = " + endpoint.getFormat() +
- "] [ force soap=" + endpoint.isForceSOAP() +
+ "] [ force soap11=" + endpoint.isForceSOAP11() +
+ "] [ force soap12=" + endpoint.isForceSOAP12() +
"; pox=" + endpoint.isForcePOX() : "") +
"] [ to " + synapseOutMessageContext.getTo() + "]");
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java?rev=587429&r1=587428&r2=587429&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/utils/EndpointDefinition.java
Tue Oct 23 02:28:30 2007
@@ -45,8 +45,10 @@
private boolean useSeparateListener = false;
/** force REST on **/
private boolean forcePOX = false;
- /** force SOAP on **/
- private boolean forceSOAP = false;
+ /** force SOAP11 on **/
+ private boolean forceSOAP11 = false;
+ /** force SOAP11 on **/
+ private boolean forceSOAP12 = false;
/** use MTOM **/
private boolean useMTOM = false;
/** use SWA **/
@@ -182,12 +184,20 @@
return forcePOX;
}
- public void setForceSOAP(boolean forceSOAP) {
- this.forceSOAP = forceSOAP;
+ public void setForceSOAP11(boolean forceSOAP11) {
+ this.forceSOAP11 = forceSOAP11;
}
- public boolean isForceSOAP() {
- return forceSOAP;
+ public boolean isForceSOAP11() {
+ return forceSOAP11;
+ }
+
+ public void setForceSOAP12(boolean forceSOAP12) {
+ this.forceSOAP12 = forceSOAP12;
+ }
+
+ public boolean isForceSOAP12() {
+ return forceSOAP12;
}
public boolean isUseMTOM() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
