You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2007/01/04 15:53:15 UTC
svn commit: r492589 - in /webservices/axis2/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
addressing/test-resources/
addressing/test-resources/invalid-cardinality-messages/final/
addressing/test-resources/invalid-cardinality-...
Author: davidillsley
Date: Thu Jan 4 06:53:13 2007
New Revision: 492589
URL: http://svn.apache.org/viewvc?view=rev&rev=492589
Log:
Add support for wsa:Action and wsa:MessageID extensibility attributes
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityActionMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFaultToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFromMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityMessageIDMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityReplyToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityActionMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFaultToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFromMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityMessageIDMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityReplyToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityToMessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/final/soapmessage.xml
webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/submission/soapmessage.xml
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTestBase.java
webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java Thu Jan 4 06:53:13 2007
@@ -151,8 +151,7 @@
} else if (WSA_FAULT_TO.equals(soapHeaderBlock.getLocalName()) && !ignoreFaultTo) {
extractFaultToEPRInformation(soapHeaderBlock, namespace, messageContext);
} else if (WSA_MESSAGE_ID.equals(soapHeaderBlock.getLocalName()) && !ignoreMessageID) {
- messageContextOptions.setMessageId(soapHeaderBlock.getText());
- soapHeaderBlock.setProcessed();
+ extractMessageIDInformation(soapHeaderBlock, addressingNamespace, messageContext);
} else if (WSA_ACTION.equals(soapHeaderBlock.getLocalName()) && !ignoreAction) {
extractActionInformation(soapHeaderBlock, namespace, messageContext);
} else if (WSA_RELATES_TO.equals(soapHeaderBlock.getLocalName())) {
@@ -283,6 +282,17 @@
epr = new EndpointReference(soapHeaderBlock.getText());
messageContextOptions.setTo(epr);
+ // check for address attributes
+ Iterator addressAttributes = soapHeaderBlock.getAllAttributes();
+ if(addressAttributes != null && addressAttributes.hasNext()){
+ ArrayList attributes = new ArrayList();
+ while(addressAttributes.hasNext()){
+ OMAttribute attr = (OMAttribute)addressAttributes.next();
+ attributes.add(attr);
+ }
+ epr.setAddressAttributes(attributes);
+ }
+
// check for reference parameters
extractToEprReferenceParameters(epr, header, namespace);
soapHeaderBlock.setProcessed();
@@ -324,9 +334,25 @@
messageContextOptions.setAction(wsaAction);
}
+ ArrayList attributes = extractAttributesFromSOAPHeaderBlock(soapHeaderBlock);
+ if(attributes!=null){
+ messageContext.setProperty(AddressingConstants.ACTION_ATTRIBUTES, attributes);
+ }
+
soapHeaderBlock.setProcessed();
}
+ private void extractMessageIDInformation(SOAPHeaderBlock soapHeaderBlock, String addressingNamespace, MessageContext messageContext) throws AxisFault {
+ messageContext.getOptions().setMessageId(soapHeaderBlock.getText());
+
+ ArrayList attributes = extractAttributesFromSOAPHeaderBlock(soapHeaderBlock);
+ if(attributes!=null){
+ messageContext.setProperty(AddressingConstants.MESSAGEID_ATTRIBUTES, attributes);
+ }
+
+ soapHeaderBlock.setProcessed();
+ }
+
/**
* Given the soap header block, this should extract the information within EPR.
*
@@ -343,5 +369,18 @@
}
AddressingFaultsHelper.triggerMissingAddressInEPRFault(messageContext, headerBlock.getLocalName());
}
+ }
+
+ private ArrayList extractAttributesFromSOAPHeaderBlock(SOAPHeaderBlock soapHeaderBlock){
+ Iterator actionAttributes = soapHeaderBlock.getAllAttributes();
+ if(actionAttributes != null && actionAttributes.hasNext()){
+ ArrayList attributes = new ArrayList();
+ while(actionAttributes.hasNext()){
+ OMAttribute attr = (OMAttribute)actionAttributes.next();
+ attributes.add(attr);
+ }
+ return attributes;
+ }
+ return null;
}
}
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=492589&r1=492588&r2=492589
==============================================================================
--- 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 Thu Jan 4 06:53:13 2007
@@ -16,8 +16,10 @@
package org.apache.axis2.handlers.addressing;
+import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.util.AttributeHelper;
import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -40,6 +42,7 @@
import javax.xml.namespace.QName;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -105,11 +108,8 @@
// processing WSA FaultTo
processFaultToEPR(messageContextOptions, envelope, addressingNamespaceObject, replaceHeaders, isFinalAddressingNamespace);
- String messageID = messageContextOptions.getMessageId();
- if (messageID != null && !isAddressingHeaderAlreadyAvailable(WSA_MESSAGE_ID, envelope,
- addressingNamespaceObject, replaceHeaders)) {//optional
- processStringInfo(messageID, WSA_MESSAGE_ID, envelope, addressingNamespaceObject);
- }
+ // processing WSA MessageID
+ processMessageID(messageContextOptions, envelope, msgContext, addressingNamespaceObject, replaceHeaders, isFinalAddressingNamespace);
// processing WSA Action
processWSAAction(messageContextOptions, envelope, msgContext, addressingNamespaceObject, replaceHeaders, isFinalAddressingNamespace);
@@ -126,6 +126,21 @@
return InvocationResponse.CONTINUE;
}
+ private void processMessageID(Options messageContextOptions, SOAPEnvelope envelope, MessageContext msgContext, OMNamespace addressingNamespaceObject, boolean replaceHeaders, boolean isFinalAddressingNamespace) {
+ String messageID = messageContextOptions.getMessageId();
+ if (messageID != null && !isAddressingHeaderAlreadyAvailable(WSA_MESSAGE_ID, envelope,
+ addressingNamespaceObject, replaceHeaders)) {//optional
+ OMElement oe = processStringInfo(messageID, WSA_MESSAGE_ID, envelope, addressingNamespaceObject);
+ ArrayList attributes = (ArrayList)messageContextOptions.getProperty(AddressingConstants.MESSAGEID_ATTRIBUTES);
+ if(attributes!= null && !attributes.isEmpty()){
+ Iterator attrIterator = attributes.iterator();
+ while(attrIterator.hasNext()){
+ AttributeHelper.importOMAttribute((OMAttribute)attrIterator.next(), oe);
+ }
+ }
+ }
+ }
+
private void processWSAAction(Options messageContextOptions, SOAPEnvelope envelope,
MessageContext msgCtxt, OMNamespace addressingNamespaceObject, boolean replaceHeaders, boolean isFinalAddressingNamespace) throws AxisFault {
String action = messageContextOptions.getAction();
@@ -170,7 +185,14 @@
log.trace("processWSAAction: Adding action to header: "+action);
}
// Otherwise just add the header
- processStringInfo(action, WSA_ACTION, envelope, addressingNamespaceObject);
+ OMElement oe = processStringInfo(action, WSA_ACTION, envelope, addressingNamespaceObject);
+ ArrayList attributes = (ArrayList)messageContextOptions.getProperty(AddressingConstants.ACTION_ATTRIBUTES);
+ if(attributes!= null && !attributes.isEmpty()){
+ Iterator attrIterator = attributes.iterator();
+ while(attrIterator.hasNext()){
+ AttributeHelper.importOMAttribute((OMAttribute)attrIterator.next(), oe);
+ }
+ }
}
}
}
@@ -267,6 +289,13 @@
if (!"".equals(address) && address != null) {
SOAPHeaderBlock toHeaderBlock = envelope.getHeader().addHeaderBlock(WSA_TO, addressingNamespaceObject);
toHeaderBlock.setText(address);
+ if(epr.getAddressAttributes() != null){
+ Iterator addressAttributes = epr.getAddressAttributes().iterator();
+ while(addressAttributes.hasNext()){
+ OMAttribute attr = (OMAttribute)addressAttributes.next();
+ AttributeHelper.importOMAttribute(attr, toHeaderBlock);
+ }
+ }
}
processToEPRReferenceInformation(referenceParameters, envelope.getHeader(), addressingNamespaceObject, isFinalAddressingNamespace);
}
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml Thu Jan 4 06:53:13 2007
@@ -1,5 +1,5 @@
<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
- <soapenv:Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
+ <soapenv:Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
<wsa:Reference4>Value 400</wsa:Reference4>
<wsa:Reference1>Value 100</wsa:Reference1>
<wsa:Reference0>Value 0</wsa:Reference0>
@@ -11,7 +11,8 @@
http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous
</wsa:Address>
</wsa:ReplyTo>
- <wsa:Action>http://www.actions.org/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://www.actions.org/action</wsa:Action>
+ <wsa:MessageID axis2:AttrExt="123456789">urn:test:123</wsa:MessageID>
</soapenv:Header>
<soapenv:Body />
</soapenv:Envelope>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityActionMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityActionMessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityActionMessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityActionMessage.xml Thu Jan 4 06:53:13 2007
@@ -18,9 +18,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From soapenv:mustUnderstand="0">
<wsa:Address>
http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
@@ -34,8 +34,8 @@
<fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
</wsa:ReferenceParameters>
</wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:FaultTo>
<wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
</wsa:FaultTo>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFaultToMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFaultToMessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFaultToMessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFaultToMessage.xml Thu Jan 4 06:53:13 2007
@@ -18,9 +18,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From soapenv:mustUnderstand="0">
<wsa:Address>
http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
@@ -34,7 +34,7 @@
<fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
</wsa:ReferenceParameters>
</wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:FaultTo>
<wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
</wsa:FaultTo>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFromMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFromMessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFromMessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityFromMessage.xml Thu Jan 4 06:53:13 2007
@@ -18,9 +18,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From soapenv:mustUnderstand="0">
<wsa:Address>
http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
@@ -38,7 +38,7 @@
<fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
</wsa:ReferenceParameters>
</wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:FaultTo>
<wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
</wsa:FaultTo>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityMessageIDMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityMessageIDMessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityMessageIDMessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityMessageIDMessage.xml Thu Jan 4 06:53:13 2007
@@ -18,11 +18,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
<wsa:MessageID soapenv:mustUnderstand="0">
uuid:820C5190-0B8F-11D9-8DDD-F67EDEEBF7Z6</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From soapenv:mustUnderstand="0">
<wsa:Address>
http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
@@ -36,7 +36,7 @@
<fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
</wsa:ReferenceParameters>
</wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:FaultTo>
<wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
</wsa:FaultTo>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityReplyToMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityReplyToMessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityReplyToMessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityReplyToMessage.xml Thu Jan 4 06:53:13 2007
@@ -18,9 +18,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From soapenv:mustUnderstand="0">
<wsa:Address>
http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
@@ -34,7 +34,7 @@
<fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
</wsa:ReferenceParameters>
</wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:ReplyTo>
<wsa:Address>http://example.com/fabrikam/acct2</wsa:Address>
<wsa:ReferenceParameters>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityToMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityToMessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityToMessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/final/invalidCardinalityToMessage.xml Thu Jan 4 06:53:13 2007
@@ -18,10 +18,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From soapenv:mustUnderstand="0">
<wsa:Address>
http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
@@ -35,7 +35,7 @@
<fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
</wsa:ReferenceParameters>
</wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:FaultTo>
<wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
</wsa:FaultTo>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityActionMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityActionMessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityActionMessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityActionMessage.xml Thu Jan 4 06:53:13 2007
@@ -18,9 +18,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From soapenv:mustUnderstand="0">
<wsa:Address>
http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>
@@ -34,8 +34,8 @@
<fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
</wsa:ReferenceParameters>
</wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:FaultTo>
<wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
</wsa:FaultTo>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFaultToMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFaultToMessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFaultToMessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFaultToMessage.xml Thu Jan 4 06:53:13 2007
@@ -18,9 +18,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From soapenv:mustUnderstand="0">
<wsa:Address>
http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>
@@ -34,7 +34,7 @@
<fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
</wsa:ReferenceParameters>
</wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:FaultTo>
<wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
</wsa:FaultTo>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFromMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFromMessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFromMessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityFromMessage.xml Thu Jan 4 06:53:13 2007
@@ -18,9 +18,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From soapenv:mustUnderstand="0">
<wsa:Address>
http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>
@@ -38,7 +38,7 @@
<fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
</wsa:ReferenceParameters>
</wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:FaultTo>
<wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
</wsa:FaultTo>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityMessageIDMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityMessageIDMessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityMessageIDMessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityMessageIDMessage.xml Thu Jan 4 06:53:13 2007
@@ -18,11 +18,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
<wsa:MessageID soapenv:mustUnderstand="0">
uuid:820C5190-0B8F-11D9-8DDD-F67EDEEBF7Z6</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From soapenv:mustUnderstand="0">
<wsa:Address>
http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>
@@ -36,7 +36,7 @@
<fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
</wsa:ReferenceParameters>
</wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:FaultTo>
<wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
</wsa:FaultTo>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityReplyToMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityReplyToMessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityReplyToMessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityReplyToMessage.xml Thu Jan 4 06:53:13 2007
@@ -18,9 +18,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From soapenv:mustUnderstand="0">
<wsa:Address>
http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>
@@ -34,7 +34,7 @@
<fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
</wsa:ReferenceParameters>
</wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:ReplyTo>
<wsa:Address>http://example.com/fabrikam/acct2</wsa:Address>
<wsa:ReferenceParameters>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityToMessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityToMessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityToMessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/invalid-cardinality-messages/submission/invalidCardinalityToMessage.xml Thu Jan 4 06:53:13 2007
@@ -18,10 +18,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From soapenv:mustUnderstand="0">
<wsa:Address>
http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>
@@ -35,7 +35,7 @@
<fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>
</wsa:ReferenceParameters>
</wsa:ReplyTo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:FaultTo>
<wsa:Address>http://example.com/fabrikam/fault</wsa:Address>
</wsa:FaultTo>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/final/soapmessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/final/soapmessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/final/soapmessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/final/soapmessage.xml Thu Jan 4 06:53:13 2007
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:wsa="http://www.w3.org/2005/08/addressing">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam" xmlns:axis2="http://ws.apache.org/namespaces/axis2">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From soapenv:mustUnderstand="0" axis2:AttrExt="123456789">
<wsa:Address>http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>
<wsa:ReferenceParameters>
@@ -19,7 +19,7 @@
</wsa:From>
<axis2:ParamOne wsa:IsReferenceParameter='true'>123456789</axis2:ParamOne>
<axis2:ParamTwo wsa:IsReferenceParameter='true'>ABCDEFG</axis2:ParamTwo>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:ReplyTo axis2:AttrExt="123456789">
<wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
<wsa:ReferenceParameters>
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/submission/soapmessage.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/submission/soapmessage.xml?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/submission/soapmessage.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/valid-messages/submission/soapmessage.xml Thu Jan 4 06:53:13 2007
@@ -4,9 +4,9 @@
xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
xmlns:axis2="http://ws.apache.org/namespaces/axis2">
<soapenv:Header xmlns:fabrikam="http://example.com/fabrikam">
- <wsa:MessageID soapenv:mustUnderstand="0">
+ <wsa:MessageID axis2:AttrExt="123456789" soapenv:mustUnderstand="0">
uuid:920C5190-0B8F-11D9-8CED-F22EDEEBF7E5</wsa:MessageID>
- <wsa:To soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
+ <wsa:To axis2:AttrExt="123456789" soapenv:mustUnderstand="0">http://localhost:8081/axis/services/BankPort</wsa:To>
<wsa:From axis2:AttrExt="123456789" soapenv:mustUnderstand="0" >
<wsa:Address>
http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>
@@ -18,7 +18,7 @@
</wsa:ReferenceProperties>
<axis2:EPRExt axis2:AttrExt="123456789">123456789</axis2:EPRExt>
</wsa:From>
- <wsa:Action>http://ws.apache.org/tests/action</wsa:Action>
+ <wsa:Action axis2:AttrExt="123456789">http://ws.apache.org/tests/action</wsa:Action>
<wsa:ReplyTo axis2:AttrExt="123456789">
<wsa:Address>http://example.com/fabrikam/acct</wsa:Address>
<wsa:ReferenceParameters>
Modified: webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTestBase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTestBase.java?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTestBase.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingInHandlerTestBase.java Thu Jan 4 06:53:13 2007
@@ -86,9 +86,11 @@
assertEquals("action header is not correct",
options.getAction(),
action);
+ assertActionHasExtensibilityAttribute(mc);
assertEquals("message id header is not correct",
options.getMessageId().trim(),
messageID.trim());
+ assertMessageIDHasExtensibilityAttribute(mc);
assertFullFromEPR(options.getFrom());
assertFullFaultEPR(options.getFaultTo());
@@ -210,9 +212,11 @@
}
private void assertToEPR(EndpointReference toEPR) {
+ System.out.println(toEPR);
assertEquals("Address in To EPR is not valid",
toEPR.getAddress().trim(),
toAddress.trim());
+ assertEPRAddressHasExtensibilityAttribute(toEPR);
}
private void assertFullFromEPR(EndpointReference fromEPR) {
@@ -259,6 +263,54 @@
}else{
fail("No ReferenceParameters found in EPR");
}
+ }
+
+ private void assertActionHasExtensibilityAttribute(MessageContext mc){
+ boolean attributeFound=false;
+ ArrayList attributes = (ArrayList)mc.getProperty(AddressingConstants.ACTION_ATTRIBUTES);
+ if(attributes!=null){
+ Iterator iter = attributes.iterator();
+ while(iter.hasNext()){
+ OMAttribute oa = (OMAttribute)iter.next();
+ if(oa.getLocalName().equals("AttrExt")){
+ attributeFound = true;
+ assertEquals("Attribute value incorrectly deserialised",oa.getAttributeValue(),"123456789");
+ }
+ }
+ }
+ assertTrue("Extensibility attribute not found on Action", attributeFound);
+ }
+
+ private void assertMessageIDHasExtensibilityAttribute(MessageContext mc){
+ boolean attributeFound=false;
+ ArrayList attributes = (ArrayList)mc.getProperty(AddressingConstants.MESSAGEID_ATTRIBUTES);
+ if(attributes!=null){
+ Iterator iter = attributes.iterator();
+ while(iter.hasNext()){
+ OMAttribute oa = (OMAttribute)iter.next();
+ if(oa.getLocalName().equals("AttrExt")){
+ attributeFound = true;
+ assertEquals("Attribute value incorrectly deserialised",oa.getAttributeValue(),"123456789");
+ }
+ }
+ }
+ assertTrue("Extensibility attribute not found on MessageID", attributeFound);
+ }
+
+ private void assertEPRAddressHasExtensibilityAttribute(EndpointReference epr){
+ boolean attributeFound=false;
+ ArrayList attributes = epr.getAddressAttributes();
+ if(attributes!=null){
+ Iterator iter = attributes.iterator();
+ while(iter.hasNext()){
+ OMAttribute oa = (OMAttribute)iter.next();
+ if(oa.getLocalName().equals("AttrExt")){
+ attributeFound = true;
+ assertEquals("Attribute value incorrectly deserialised",oa.getAttributeValue(),"123456789");
+ }
+ }
+ }
+ assertTrue("Extensibility attribute not found on EPR Address", attributeFound);
}
private void assertEPRHasExtensibilityAttribute(EndpointReference epr){
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=492589&r1=492588&r2=492589
==============================================================================
--- 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 Thu Jan 4 06:53:13 2007
@@ -16,8 +16,11 @@
package org.apache.axis2.handlers.addressing;
+import java.util.ArrayList;
+
import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.impl.llom.util.XMLComparator;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -29,6 +32,8 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.handlers.util.TestUtil;
+import com.ibm.xslt4j.bcel.generic.NEWARRAY;
+
import javax.xml.namespace.QName;
public class AddressingOutHandlerTest extends TestCase implements AddressingConstants {
@@ -68,6 +73,15 @@
msgCtxt.setReplyTo(replyTo);
msgCtxt.setEnvelope(defaultEnvelope);
msgCtxt.setWSAAction("http://www.actions.org/action");
+ msgCtxt.setMessageID("urn:test:123");
+
+ OMAttribute extAttr = OMAbstractFactory.getOMFactory().createOMAttribute("AttrExt", OMAbstractFactory.getOMFactory().createOMNamespace("http://ws.apache.org/namespaces/axis2", "axis2"), "123456789");
+ ArrayList al = new ArrayList();
+ al.add(extAttr);
+
+ msgCtxt.setProperty(AddressingConstants.ACTION_ATTRIBUTES, al);
+ msgCtxt.setProperty(AddressingConstants.MESSAGEID_ATTRIBUTES, al);
+
outHandler.invoke(msgCtxt);
StAXSOAPModelBuilder omBuilder = testUtil.getOMBuilder("eprTest.xml");
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java?view=diff&rev=492589&r1=492588&r2=492589
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingConstants.java Thu Jan 4 06:53:13 2007
@@ -71,6 +71,15 @@
public static final String ADD_MUST_UNDERSTAND_TO_ADDRESSING_HEADERS = "addMustUnderstandToAddressingHeaders";
+ /** A property pointing to an ArrayList of OMAttribute objects representing any attributes
+ * of the wsa:Action header.
+ */
+ public static final String ACTION_ATTRIBUTES = "actionAttributes";
+ /** A property pointing to an ArrayList of OMAttribute objects representing any attributes
+ * of the wsa:MessageID header.
+ */
+ public static final String MESSAGEID_ATTRIBUTES = "messageidAttributes";
+
/**
* This property, if set to Boolean.TRUE, will mean that the addressing handler allows partially
* ws-addressed messages to be sent even if they are then invalid rather than throwing a fault.
@@ -85,7 +94,7 @@
// ======================== Common Faults ==============================
public static final String FAULT_ACTION_NOT_SUPPORTED = "ActionNotSupported";
public static final String FAULT_ACTION_NOT_SUPPORTED_REASON = "The [action] cannot be processed at the receiver.";
-
+
public interface Final {
// ====================== Addressing 1.0 Final Version Constants ====================
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org