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 da...@apache.org on 2006/12/08 12:14:33 UTC
svn commit: r483931 - in
/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2:
addressing/ handlers/addressing/
Author: davidillsley
Date: Fri Dec 8 03:14:28 2006
New Revision: 483931
URL: http://svn.apache.org/viewvc?view=rev&rev=483931
Log:
Clean up addressing module code
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java
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/src/org/apache/axis2/handlers/addressing/AddressingSubmissionInHandler.java
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingWSDLValidationHandler.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java?view=diff&rev=483931&r1=483930&r2=483931
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/addressing/AddressingFaultsHelper.java Fri Dec 8 03:14:28 2006
@@ -50,10 +50,11 @@
log.debug("triggerInvalidCardinalityFault: messageContext: "+messageContext+" incorrectHeaderName: "+incorrectHeaderName);
}
String namespace = (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- if (Submission.WSA_NAMESPACE.equals(namespace))
+ if (Submission.WSA_NAMESPACE.equals(namespace)){
triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Submission.FAULT_INVALID_HEADER, null, Submission.FAULT_INVALID_HEADER_REASON);
- else
+ }else{
triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Final.FAULT_INVALID_HEADER, "InvalidCardinality", Final.FAULT_INVALID_HEADER_REASON);
+ }
}
// wsa:MissingAddressInEPR
@@ -62,10 +63,11 @@
log.debug("triggerMissingAddressInEPRFault: messageContext: "+messageContext+" incorrectHeaderName: "+incorrectHeaderName);
}
String namespace = (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- if (Submission.WSA_NAMESPACE.equals(namespace))
+ if (Submission.WSA_NAMESPACE.equals(namespace)){
triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Submission.FAULT_INVALID_HEADER, null, Submission.FAULT_INVALID_HEADER_REASON);
- else
+ }else{
triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Final.FAULT_INVALID_HEADER, "MissingAddressInEPR", Final.FAULT_INVALID_HEADER_REASON);
+ }
}
// wsa:DuplicateMessageID
@@ -75,10 +77,11 @@
log.debug("triggerActionMismatchFault: messageContext: "+messageContext);
}
String namespace = (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- if (Submission.WSA_NAMESPACE.equals(namespace))
+ if (Submission.WSA_NAMESPACE.equals(namespace)){
triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":Action", Submission.FAULT_INVALID_HEADER, null, Submission.FAULT_INVALID_HEADER_REASON);
- else
+ }else{
triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":Action", Final.FAULT_INVALID_HEADER, "ActionMismatch", Final.FAULT_INVALID_HEADER_REASON);
+ }
}
// wsa:OnlyAnonymousAddressSupported
@@ -87,10 +90,11 @@
log.debug("triggerOnlyAnonymousAddressSupportedFault: messageContext: "+messageContext+" incorrectHeaderName: "+incorrectHeaderName);
}
String namespace = (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- if (Submission.WSA_NAMESPACE.equals(namespace))
+ if (Submission.WSA_NAMESPACE.equals(namespace)){
triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Submission.FAULT_INVALID_HEADER, null, Submission.FAULT_INVALID_HEADER_REASON);
- else
+ }else{
triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Final.FAULT_INVALID_HEADER, Final.FAULT_ONLY_ANONYMOUS_ADDRESS_SUPPORTED, Final.FAULT_INVALID_HEADER_REASON);
+ }
}
// wsa:OnlyNonAnonymousAddressSupported
@@ -99,10 +103,11 @@
log.debug("triggerOnlyNonAnonymousAddressSupportedFault: messageContext: "+messageContext+" incorrectHeaderName: "+incorrectHeaderName);
}
String namespace = (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- if (Submission.WSA_NAMESPACE.equals(namespace))
+ if (Submission.WSA_NAMESPACE.equals(namespace)){
triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Submission.FAULT_INVALID_HEADER, null, Submission.FAULT_INVALID_HEADER_REASON);
- else
+ }else{
triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + incorrectHeaderName, Final.FAULT_INVALID_HEADER, Final.FAULT_ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED, Final.FAULT_INVALID_HEADER_REASON);
+ }
}
// wsa:MessageAddressingHeaderRequired [Reason] the string: "A required header representing a Message Addressing Property is not present"
@@ -111,10 +116,11 @@
log.debug("triggerMessageAddressingRequiredFault: messageContext: "+messageContext+" missingHeaderName: "+missingHeaderName);
}
String namespace = (String) messageContext.getProperty(AddressingConstants.WS_ADDRESSING_VERSION);
- if (Submission.WSA_NAMESPACE.equals(namespace))
+ if (Submission.WSA_NAMESPACE.equals(namespace)){
triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + missingHeaderName, Submission.FAULT_ADDRESSING_HEADER_REQUIRED, null, Submission.FAULT_ADDRESSING_HEADER_REQUIRED_REASON);
- else
+ }else{
triggerAddressingFault(messageContext, Final.FAULT_HEADER_PROB_HEADER_QNAME, AddressingConstants.WSA_DEFAULT_PREFIX + ":" + missingHeaderName, Final.FAULT_ADDRESSING_HEADER_REQUIRED, null, Final.FAULT_ADDRESSING_HEADER_REQUIRED_REASON);
+ }
}
// wsa:ActionNotSupported [Reason] the string: "The [action] cannot be processed at the receiver"
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java?view=diff&rev=483931&r1=483930&r2=483931
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingFinalInHandler.java Fri Dec 8 03:14:28 2006
@@ -79,8 +79,9 @@
messageContextOptions.setReplyTo(epr);
}
- if (log.isTraceEnabled())
+ if (log.isTraceEnabled()){
log.trace("setDefaults: Setting WS-Addressing default value for the ReplyTo property.");
+ }
epr.setAddress(Final.WSA_ANONYMOUS_URL);
}
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=483931&r1=483930&r2=483931
==============================================================================
--- 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 Fri Dec 8 03:14:28 2006
@@ -120,46 +120,44 @@
Iterator addressingHeadersIt = addressingHeaders.iterator();
while (addressingHeadersIt.hasNext()) {
SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock) addressingHeadersIt.next();
- if (SOAP12Constants.SOAP_ROLE_NONE.equals(soapHeaderBlock.getRole()))
- continue;
-
- if (WSA_TO.equals(soapHeaderBlock.getLocalName())) {
- ignoreTo = checkDuplicateHeaders(WSA_TO, checkedHeaderNames, duplicateHeaderNames);
- } else if (WSA_FROM.equals(soapHeaderBlock.getLocalName())) {
- ignoreFrom = checkDuplicateHeaders(WSA_FROM, checkedHeaderNames, duplicateHeaderNames);
- } else if (WSA_REPLY_TO.equals(soapHeaderBlock.getLocalName())) {
- ignoreReplyTo = checkDuplicateHeaders(WSA_REPLY_TO, checkedHeaderNames, duplicateHeaderNames);
- } else if (WSA_FAULT_TO.equals(soapHeaderBlock.getLocalName())) {
- ignoreFaultTo = checkDuplicateHeaders(WSA_FAULT_TO, checkedHeaderNames, duplicateHeaderNames);
- } else if (WSA_MESSAGE_ID.equals(soapHeaderBlock.getLocalName())) {
- ignoreMessageID = checkDuplicateHeaders(WSA_MESSAGE_ID, checkedHeaderNames, duplicateHeaderNames);
- } else if (WSA_ACTION.equals(soapHeaderBlock.getLocalName())) {
- ignoreAction = checkDuplicateHeaders(WSA_ACTION, checkedHeaderNames, duplicateHeaderNames);
- }
+ if (!SOAP12Constants.SOAP_ROLE_NONE.equals(soapHeaderBlock.getRole())){
+ if (WSA_TO.equals(soapHeaderBlock.getLocalName())) {
+ ignoreTo = checkDuplicateHeaders(WSA_TO, checkedHeaderNames, duplicateHeaderNames);
+ } else if (WSA_FROM.equals(soapHeaderBlock.getLocalName())) {
+ ignoreFrom = checkDuplicateHeaders(WSA_FROM, checkedHeaderNames, duplicateHeaderNames);
+ } else if (WSA_REPLY_TO.equals(soapHeaderBlock.getLocalName())) {
+ ignoreReplyTo = checkDuplicateHeaders(WSA_REPLY_TO, checkedHeaderNames, duplicateHeaderNames);
+ } else if (WSA_FAULT_TO.equals(soapHeaderBlock.getLocalName())) {
+ ignoreFaultTo = checkDuplicateHeaders(WSA_FAULT_TO, checkedHeaderNames, duplicateHeaderNames);
+ } else if (WSA_MESSAGE_ID.equals(soapHeaderBlock.getLocalName())) {
+ ignoreMessageID = checkDuplicateHeaders(WSA_MESSAGE_ID, checkedHeaderNames, duplicateHeaderNames);
+ } else if (WSA_ACTION.equals(soapHeaderBlock.getLocalName())) {
+ ignoreAction = checkDuplicateHeaders(WSA_ACTION, checkedHeaderNames, duplicateHeaderNames);
+ }
+ }
}
// Now extract information
Iterator addressingHeadersIt2 = addressingHeaders.iterator();
while (addressingHeadersIt2.hasNext()) {
SOAPHeaderBlock soapHeaderBlock = (SOAPHeaderBlock) addressingHeadersIt2.next();
- if (SOAP12Constants.SOAP_ROLE_NONE.equals(soapHeaderBlock.getRole()))
- continue;
-
- if (WSA_TO.equals(soapHeaderBlock.getLocalName()) && !ignoreTo) {
- extractToEPRInformation(soapHeaderBlock, messageContextOptions, header, namespace);
- } else if (WSA_FROM.equals(soapHeaderBlock.getLocalName()) && !ignoreFrom) {
- extractFromEPRInformation(soapHeaderBlock, namespace, messageContext);
- } else if (WSA_REPLY_TO.equals(soapHeaderBlock.getLocalName()) && !ignoreReplyTo) {
- extractReplyToEPRInformation(soapHeaderBlock, namespace, messageContext);
- } 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();
- } else if (WSA_ACTION.equals(soapHeaderBlock.getLocalName()) && !ignoreAction) {
- extractActionInformation(soapHeaderBlock, namespace, messageContext);
- } else if (WSA_RELATES_TO.equals(soapHeaderBlock.getLocalName())) {
- extractRelatesToInformation(soapHeaderBlock, namespace, messageContextOptions);
+ if (!SOAP12Constants.SOAP_ROLE_NONE.equals(soapHeaderBlock.getRole())){
+ if (WSA_TO.equals(soapHeaderBlock.getLocalName()) && !ignoreTo) {
+ extractToEPRInformation(soapHeaderBlock, messageContextOptions, header, namespace);
+ } else if (WSA_FROM.equals(soapHeaderBlock.getLocalName()) && !ignoreFrom) {
+ extractFromEPRInformation(soapHeaderBlock, namespace, messageContext);
+ } else if (WSA_REPLY_TO.equals(soapHeaderBlock.getLocalName()) && !ignoreReplyTo) {
+ extractReplyToEPRInformation(soapHeaderBlock, namespace, messageContext);
+ } 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();
+ } else if (WSA_ACTION.equals(soapHeaderBlock.getLocalName()) && !ignoreAction) {
+ extractActionInformation(soapHeaderBlock, namespace, messageContext);
+ } else if (WSA_RELATES_TO.equals(soapHeaderBlock.getLocalName())) {
+ extractRelatesToInformation(soapHeaderBlock, namespace, messageContextOptions);
+ }
}
}
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=483931&r1=483930&r2=483931
==============================================================================
--- 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 Dec 8 03:14:28 2006
@@ -294,18 +294,20 @@
String anonymous = isFinalAddressingNamespace ?
Final.WSA_ANONYMOUS_URL : Submission.WSA_ANONYMOUS_URL;
- if (epr == null) {
- epr = new EndpointReference(anonymous);
+ EndpointReference eprCopy = epr;
+
+ if (eprCopy == null) {
+ eprCopy = new EndpointReference(anonymous);
}
- else if (!isFinalAddressingNamespace && epr.hasNoneAddress()) {
+ else if (!isFinalAddressingNamespace && eprCopy.hasNoneAddress()) {
return; //Omit the header.
}
- else if (epr.hasAnonymousAddress()) {
- epr.setAddress(anonymous);
+ else if (eprCopy.hasAnonymousAddress()) {
+ eprCopy.setAddress(anonymous);
}
OMElement soapHeaderBlock = EndpointReferenceHelper.toOM(envelope.getOMFactory(),
- epr,
+ eprCopy,
new QName(namespace, headerName, prefix), namespace);
envelope.getHeader().addChild(soapHeaderBlock);
}
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingSubmissionInHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingSubmissionInHandler.java?view=diff&rev=483931&r1=483930&r2=483931
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingSubmissionInHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingSubmissionInHandler.java Fri Dec 8 03:14:28 2006
@@ -78,9 +78,10 @@
messageContextOptions.setReplyTo(epr);
}
- if (log.isTraceEnabled())
+ if (log.isTraceEnabled()){
log.trace("setDefaults: Setting WS-Addressing default value for the ReplyTo property.");
-
+ }
+
epr.setAddress(Final.WSA_NONE_URI);
}
}
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingWSDLValidationHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingWSDLValidationHandler.java?view=diff&rev=483931&r1=483930&r2=483931
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingWSDLValidationHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingWSDLValidationHandler.java Fri Dec 8 03:14:28 2006
@@ -52,12 +52,14 @@
private void checkUsingAddressing(MessageContext msgContext)
throws AxisFault {
String addressingFlag = msgContext.getAxisService().getWSAddressingFlag();
- if (log.isTraceEnabled())
+ if (log.isTraceEnabled()){
log.trace("checkUsingAddressing: WSAddressingFlag=" + addressingFlag);
+ }
if (AddressingConstants.ADDRESSING_REQUIRED.equals(addressingFlag)) {
Object flag = msgContext.getProperty(AddressingConstants.IS_ADDR_INFO_ALREADY_PROCESSED);
- if (log.isTraceEnabled())
+ if (log.isTraceEnabled()){
log.trace("checkUsingAddressing: IS_ADDR_INFO_ALREADY_PROCESSED=" + flag);
+ }
if (JavaUtils.isFalseExplicitly(flag)) {
AddressingFaultsHelper.triggerMessageAddressingRequiredFault(msgContext,AddressingConstants.WSA_ACTION);
}
@@ -70,8 +72,9 @@
*/
private void checkAnonymous(MessageContext msgContext) throws AxisFault {
String anonymous = AddressingHelper.getAnonymousParameterValue(msgContext.getAxisOperation());
- if (log.isTraceEnabled())
+ if (log.isTraceEnabled()){
log.trace("checkAnonymous: Anonymous=" + anonymous);
+ }
if("required".equals(anonymous)){
if(AddressingHelper.isReplyRedirected(msgContext)){
EndpointReference anonEPR = new EndpointReference(AddressingConstants.Final.WSA_ANONYMOUS_URL);
@@ -102,8 +105,9 @@
*/
private void checkAction(MessageContext msgContext) throws AxisFault{
Object flag = msgContext.getProperty(AddressingConstants.IS_ADDR_INFO_ALREADY_PROCESSED);
- if (log.isTraceEnabled())
+ if (log.isTraceEnabled()){
log.trace("checkAction: IS_ADDR_INFO_ALREADY_PROCESSED=" + flag);
+ }
if(JavaUtils.isTrueExplicitly(flag)){
if((msgContext.getAxisService() == null) || (msgContext.getAxisOperation() == null)){
AddressingFaultsHelper.triggerActionNotSupportedFault(msgContext, msgContext.getWSAAction());
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org