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 ch...@apache.org on 2005/09/07 07:07:24 UTC
svn commit: r279246 - in /webservices/axis2/trunk/java/modules/addressing:
src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
test-resources/eprTest.xml
test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
Author: chinthaka
Date: Tue Sep 6 22:07:12 2005
New Revision: 279246
URL: http://svn.apache.org/viewcvs?rev=279246&view=rev
Log:
Fixing Axis2-206. If addressing enabled and replyTo is null, replyTo get the value of anonymous.
Modified:
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/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=279246&r1=279245&r2=279246&view=diff
==============================================================================
--- 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 Tue Sep 6 22:07:12 2005
@@ -116,9 +116,16 @@
}
epr = messageInformationHeaders.getReplyTo();
- if (epr != null) {//optional
- addToSOAPHeader(epr, AddressingConstants.WSA_REPLY_TO, soapHeader);
+ if (epr == null) {//optional
+ // setting anonymous URI. Defaulting to Final.
+ String anonymousURI = Final.WSA_ANONYMOUS_URL;
+ if (Submission.WSA_NAMESPACE.equals(addressingNamespace)) {
+ anonymousURI = Submission.WSA_ANONYMOUS_URL;
+ }
+ epr = new EndpointReference(anonymousURI);
}
+ addToSOAPHeader(epr, AddressingConstants.WSA_REPLY_TO, soapHeader);
+
epr = messageInformationHeaders.getFrom();
if (epr != null) {//optional
@@ -229,12 +236,12 @@
OMAbstractFactory.getOMFactory().createOMElement(
addressingNamespace.equals(
Submission.WSA_NAMESPACE) ?
- Submission.EPR_PORT_TYPE : Final.WSA_INTERFACE_NAME,
+ Submission.EPR_PORT_TYPE : Final.WSA_INTERFACE_NAME,
addressingNamespaceObject);
interfaceName.addChild(
OMAbstractFactory.getOMFactory().createText(
interfaceQName.getPrefix() + ":" +
- interfaceQName.getLocalPart()));
+ interfaceQName.getLocalPart()));
parentElement.addChild(interfaceName);
}
@@ -246,15 +253,15 @@
addressingNamespaceObject);
serviceNameElement.addAttribute(
addressingNamespace.equals(Submission.WSA_NAMESPACE) ?
- Submission.EPR_SERVICE_NAME_PORT_NAME :
- Final.WSA_SERVICE_NAME_ENDPOINT_NAME,
+ Submission.EPR_SERVICE_NAME_PORT_NAME :
+ Final.WSA_SERVICE_NAME_ENDPOINT_NAME,
serviceName.getEndpointName(),
addressingNamespaceObject);
serviceNameElement.addChild(
OMAbstractFactory.getOMFactory().createText(
serviceName.getName().getPrefix()
- + ":"
- + serviceName.getName().getLocalPart()));
+ + ":"
+ + serviceName.getName().getLocalPart()));
parentElement.addChild(serviceNameElement);
}
@@ -264,9 +271,9 @@
private void processAnyContentType
(AnyContentType
- referenceValues,
+ referenceValues,
OMElement
- parentElement) {
+ parentElement) {
if (referenceValues != null) {
Iterator iterator = referenceValues.getKeys();
while (iterator.hasNext()) {
Modified: webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml?rev=279246&r1=279245&r2=279246&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml (original)
+++ webservices/axis2/trunk/java/modules/addressing/test-resources/eprTest.xml Tue Sep 6 22:07:12 2005
@@ -8,6 +8,9 @@
<wsa:ServiceName wsa:PortName="port">serviceNS:Service</wsa:ServiceName>
<wsa:PortType>portNS:Port</wsa:PortType>
<wsa:To>http://www.to.org/service/</wsa:To>
+ <wsa:ReplyTo>
+ <wsa:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:Address>
+ </wsa:ReplyTo>
</soapenv:Header>
<soapenv:Body></soapenv:Body>
</soapenv:Envelope>
Modified: webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/addressing/test/org/apache/axis2/handlers/addressing/AddressingOutHandlerTest.java?rev=279246&r1=279245&r2=279246&view=diff
==============================================================================
--- 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 Tue Sep 6 22:07:12 2005
@@ -49,6 +49,7 @@
}
public void testAddToSOAPHeader() throws Exception {
+ EndpointReference replyTo = new EndpointReference("http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous");
EndpointReference epr = new EndpointReference("http://www.to.org/service/");
epr.setInterfaceName(
new QName("http://www.from.org/service/port/",
@@ -78,6 +79,7 @@
"wsa");
MessageContext msgCtxt = new MessageContext(null);
msgCtxt.setTo(epr);
+ msgCtxt.setReplyTo(replyTo);
msgCtxt.setEnvelope(defaultEnvelope);
outHandler.invoke(msgCtxt);