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 2006/06/02 10:54:34 UTC
svn commit: r411095 - in /webservices/axis2/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/
core/src/org/apache/axis2/util/
Author: chinthaka
Date: Fri Jun 2 01:54:33 2006
New Revision: 411095
URL: http://svn.apache.org/viewvc?rev=411095&view=rev
Log:
Applying the patch in http://issues.apache.org/jira/browse/AXIS2-779
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingHandler.java?rev=411095&r1=411094&r2=411095&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingHandler.java Fri Jun 2 01:54:33 2006
@@ -30,8 +30,9 @@
protected String addressingNamespace = Final.WSA_NAMESPACE; // defaulting to final version
protected String addressingVersion = null;
protected String anonymousURI = Final.WSA_ANONYMOUS_URL; // defaulting to final version
+ protected String relationshipType = Final.WSA_DEFAULT_RELATIONSHIP_TYPE; // defaulting to final version
- private static final Log log = LogFactory.getLog(AddressingHandler.class);
+ private static final Log log = LogFactory.getLog(AddressingHandler.class);
}
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?rev=411095&r1=411094&r2=411095&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 Fri Jun 2 01:54:33 2006
@@ -95,6 +95,7 @@
addressingNamespaceObject = factory.createOMNamespace(
namespace, WSA_DEFAULT_PREFIX);
anonymousURI = namespace.equals(Final.WSA_NAMESPACE) ? Final.WSA_ANONYMOUS_URL : Submission.WSA_ANONYMOUS_URL;
+ relationshipType = namespace.equals(Final.WSA_NAMESPACE) ? Final.WSA_DEFAULT_RELATIONSHIP_TYPE : Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE;
Options messageContextOptions = msgContext.getOptions();
@@ -196,14 +197,16 @@
WSA_RELATES_TO,
envelope, addressingNamespaceObject);
+ String relationshipType = relatesTo[i].getRelationshipType();
+
if (relatesToHeader != null) {
- if ("".equals(relatesTo[i].getRelationshipType())) {
+ if (Final.WSA_DEFAULT_RELATIONSHIP_TYPE.equals(relationshipType) || "".equals(relationshipType)) {
relatesToHeader.addAttribute(WSA_RELATES_TO_RELATIONSHIP_TYPE,
- Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE,
+ this.relationshipType,
addressingNamespaceObject);
} else {
relatesToHeader.addAttribute(WSA_RELATES_TO_RELATIONSHIP_TYPE,
- relatesTo[i].getRelationshipType(),
+ relationshipType,
addressingNamespaceObject);
}
}
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=411095&r1=411094&r2=411095&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Fri Jun 2 01:54:33 2006
@@ -79,7 +79,7 @@
newmsgCtx.addRelatesTo(
new RelatesTo(
oldOptions.getMessageId(),
- AddressingConstants.Submission.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE));
+ AddressingConstants.Final.WSA_RELATES_TO_RELATIONSHIP_TYPE_DEFAULT_VALUE));
newmsgCtx.setWSAAction(oldOptions.getAction());
newmsgCtx.setOperationContext(inMessageContext.getOperationContext());
newmsgCtx.setServiceContext(inMessageContext.getServiceContext());
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org