You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2006/10/09 14:57:25 UTC
svn commit: r454363 - in /webservices/axis2/trunk/java/modules/addressing:
src/org/apache/axis2/addressing/ src/org/apache/axis2/handlers/addressing/
test/org/apache/axis2/handlers/addressing/
Author: pradine
Date: Mon Oct 9 05:57:25 2006
New Revision: 454363
URL: http://svn.apache.org/viewvc?view=rev&rev=454363
Log:
Removing temporary workaround now that Axiom snapshot has been restored.
Also made some small performance tweaks.
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/EndpointReferenceHelper.java?view=diff&rev=454363&r1=454362&r2=454363
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/EndpointReferenceHelper.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/EndpointReferenceHelper.java Mon Oct 9 05:57:25 2006
@@ -170,12 +170,9 @@
if (qname.getPrefix() != null) {
OMNamespace wrapNs = factory.createOMNamespace(qname.getNamespaceURI(), qname.getPrefix());
-//Temp workaround to aviod hitting - https://issues.apache.org/jira/browse/WSCOMMONS-103
-//since Axis2 next release (1.1) will be based on Axiom 1.1
-//We can get rid of this fix with the Axiom SNAPSHOT
-// if (factory instanceof SOAPFactory)
-// eprElement = ((SOAPFactory) factory).createSOAPHeaderBlock(qname.getLocalPart(), wrapNs);
-// else
+ if (factory instanceof SOAPFactory)
+ eprElement = ((SOAPFactory) factory).createSOAPHeaderBlock(qname.getLocalPart(), wrapNs);
+ else
eprElement = factory.createOMElement(qname.getLocalPart(), wrapNs);
OMNamespace wsaNS = factory.createOMNamespace(addressingNamespace, AddressingConstants.WSA_DEFAULT_PREFIX);
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?view=diff&rev=454363&r1=454362&r2=454363
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java Mon Oct 9 05:57:25 2006
@@ -19,7 +19,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.ElementHelper;
-import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
@@ -138,7 +137,7 @@
if (Final.WSA_FAULT_ACTION.equals(action) || Submission.WSA_FAULT_ACTION.equals(action)) {
action = isFinalAddressingNamespace ? Final.WSA_FAULT_ACTION : Submission.WSA_FAULT_ACTION;
}
- else if (Final.WSA_SOAP_FAULT_ACTION.equals(action) && !isFinalAddressingNamespace) {
+ else if (!isFinalAddressingNamespace && Final.WSA_SOAP_FAULT_ACTION.equals(action)) {
action = Submission.WSA_FAULT_ACTION;
}
@@ -152,7 +151,7 @@
OMElement detailElement = AddressingFaultsHelper.getDetailElementForAddressingFault(msgContext, addressingNamespaceObject);
if(detailElement != null){
//The difference between SOAP 1.1 and SOAP 1.2 fault messages is explained in the WS-Addressing Specs.
- if(msgContext.isSOAP11() && isFinalAddressingNamespace){
+ if(isFinalAddressingNamespace && msgContext.isSOAP11()){
// Add detail as a wsa:FaultDetail header
if (!isAddressingHeaderAlreadyAvailable(Final.FAULT_HEADER_DETAIL, envelope, addressingNamespaceObject, replaceHeaders)) {
SOAPHeaderBlock faultDetail = envelope.getHeader().addHeaderBlock(Final.FAULT_HEADER_DETAIL, addressingNamespaceObject);
@@ -270,7 +269,7 @@
if (epr == null) {
epr = new EndpointReference(anonymous);
}
- else if (epr.hasNoneAddress() && !isFinalAddressingNamespace) {
+ else if (!isFinalAddressingNamespace && epr.hasNoneAddress()) {
return; //Omit the header.
}
else if (epr.hasAnonymousAddress()) {
@@ -337,22 +336,10 @@
Object flag = msgContext.getProperty(AddressingConstants.ADD_MUST_UNDERSTAND_TO_ADDRESSING_HEADERS);
if (JavaUtils.isTrueExplicitly(flag)) {
List headers = envelope.getHeader().getHeaderBlocksWithNSURI(addressingNamespaceObject.getNamespaceURI());
- Iterator iterator = headers.iterator();
- while (iterator.hasNext()) {
- OMElement elem = (OMElement)iterator.next();
- if(elem instanceof SOAPHeaderBlock) {
- SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock) elem;
- soapHeaderBlock.setMustUnderstand(true);
- } else {
-// Temp workaround to aviod hitting - https://issues.apache.org/jira/browse/WSCOMMONS-103
-// since Axis2 next release (1.1) will be based on Axiom 1.1
-// We can get rid of this fix with the Axiom SNAPSHOT
- elem.addAttribute(SOAPConstants.ATTR_MUSTUNDERSTAND,
- "1",
- envelope.getNamespace());
- }
-
+ for (int i = 0, size = headers.size(); i < size; i++) {
+ SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock) headers.get(i);
+ soapHeaderBlock.setMustUnderstand(true);
}
}
}
Modified: webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java?view=diff&rev=454363&r1=454362&r2=454363
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java Mon Oct 9 05:57:25 2006
@@ -98,8 +98,7 @@
msgCtxt.setTo(epr);
msgCtxt.setProperty(WS_ADDRESSING_VERSION, Submission.WSA_NAMESPACE);
- epr =
- new EndpointReference("http://www.replyTo.org/service/");
+ epr = new EndpointReference("http://www.replyTo.org/service/");
msgCtxt.setReplyTo(epr);
msgCtxt.setMessageID("123456-7890");
@@ -141,8 +140,7 @@
msgCtxt.setTo(epr);
msgCtxt.setProperty(WS_ADDRESSING_VERSION, Submission.WSA_NAMESPACE);
- epr =
- new EndpointReference("http://www.replyTo.org/service/");
+ epr = new EndpointReference("http://www.replyTo.org/service/");
msgCtxt.setReplyTo(epr);
msgCtxt.setMessageID("123456-7890");
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org