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 2008/04/04 16:43:18 UTC
svn commit: r644728 - in /webservices/axis2/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java
kernel/src/org/apache/axis2/addressing/AddressingHelper.java
Author: davidillsley
Date: Fri Apr 4 07:43:16 2008
New Revision: 644728
URL: http://svn.apache.org/viewvc?rev=644728&view=rev
Log:
Fix WS-A requiredness check to allow for proper policy configuration
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingHelper.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java?rev=644728&r1=644727&r2=644728&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java Fri Apr 4 07:43:16 2008
@@ -25,6 +25,7 @@
import org.apache.axis2.addressing.AddressingHelper;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.util.JavaUtils;
@@ -76,14 +77,18 @@
*/
private void checkUsingAddressing(MessageContext msgContext)
throws AxisFault {
- if (msgContext.getAxisService() == null) {
+ AxisDescription ad = msgContext.getAxisService();
+ if (ad == null) {
if (log.isTraceEnabled()) {
log.trace("checkUsingAddressing: axisService null, cannot check UsingAddressing");
}
return;
}
+ if(msgContext.getAxisOperation()!=null){
+ ad = msgContext.getAxisOperation();
+ }
String addressingFlag =
- AddressingHelper.getAddressingRequirementParemeterValue(msgContext.getAxisService());
+ AddressingHelper.getAddressingRequirementParemeterValue(ad);
if (log.isTraceEnabled()) {
log.trace("checkUsingAddressing: WSAddressingFlag=" + addressingFlag);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingHelper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingHelper.java?rev=644728&r1=644727&r2=644728&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingHelper.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/AddressingHelper.java Fri Apr 4 07:43:16 2008
@@ -22,6 +22,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
@@ -103,11 +104,11 @@
return !doNotSendFaultUsingFaultTo;
}
- public static String getAddressingRequirementParemeterValue(AxisService axisService){
+ public static String getAddressingRequirementParemeterValue(AxisDescription axisDescription){
String value = "";
- if (axisService != null) {
+ if (axisDescription != null) {
value = Utils.getParameterValue(
- axisService.getParameter(AddressingConstants.ADDRESSING_REQUIREMENT_PARAMETER));
+ axisDescription.getParameter(AddressingConstants.ADDRESSING_REQUIREMENT_PARAMETER));
if(value !=null){
value = value.trim();
}
@@ -206,7 +207,7 @@
}
}
- public static void setAddressingRequirementParemeterValue(AxisService axisService, String value) {
+ public static void setAddressingRequirementParemeterValue(AxisDescription axisDescription, String value) {
if (value == null) {
if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
log.debug("getAddressingRequirementParemeterValue: value passed in is null. return");
@@ -215,7 +216,7 @@
}
Parameter param =
- axisService.getParameter(AddressingConstants.ADDRESSING_REQUIREMENT_PARAMETER);
+ axisDescription.getParameter(AddressingConstants.ADDRESSING_REQUIREMENT_PARAMETER);
// If an existing parameter exists
if (param != null) {
if (LoggingControl.debugLoggingAllowed && log.isDebugEnabled()) {
@@ -244,7 +245,7 @@
log.debug("setAddressingRequirementParemeterValue: Adding parameter with value: " + value);
}
// and add it to the AxisOperation object
- axisService.addParameter(param);
+ axisDescription.addParameter(param);
} catch (AxisFault af) {
// This should not happen. AxisFault is only ever thrown when a locked Parameter
// of the same name already exists and this should be dealt with by the outer
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org