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 pr...@apache.org on 2008/03/17 17:03:13 UTC
svn commit: r637956 -
/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java
Author: pradine
Date: Mon Mar 17 09:03:12 2008
New Revision: 637956
URL: http://svn.apache.org/viewvc?rev=637956&view=rev
Log:
Some refactoring of the server-side Addressing configurator.
Modified:
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java
Modified: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java?rev=637956&r1=637955&r2=637956&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java Mon Mar 17 09:03:12 2008
@@ -21,7 +21,6 @@
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.addressing.AddressingHelper;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
@@ -59,10 +58,9 @@
(Addressing) ((EndpointDescriptionJava) endpointDescription).getAnnoFeature(AddressingFeature.ID);
SubmissionAddressing submissionAddressing =
(SubmissionAddressing) ((EndpointDescriptionJava) endpointDescription).getAnnoFeature(SubmissionAddressingFeature.ID);
- AxisService service = endpointDescription.getAxisService();
Parameter namespace = new Parameter(AddressingConstants.WS_ADDRESSING_VERSION, null);
Parameter disabled = new Parameter(AddressingConstants.DISABLE_ADDRESSING_FOR_IN_MESSAGES, "false");
- String addressingRequired = AddressingConstants.ADDRESSING_UNSPECIFIED;
+ Parameter required = new Parameter(AddressingConstants.ADDRESSING_REQUIREMENT_PARAMETER, AddressingConstants.ADDRESSING_UNSPECIFIED);
if (addressing != null && submissionAddressing != null) {
//Both annotations must have been specified.
@@ -76,19 +74,19 @@
boolean submissionAddressingRequired = submissionAddressing.required();
if (w3cAddressingRequired || submissionAddressingRequired)
- addressingRequired = AddressingConstants.ADDRESSING_REQUIRED;
+ required.setValue(AddressingConstants.ADDRESSING_REQUIRED);
}
else if (w3cAddressingEnabled) {
namespace.setValue(AddressingConstants.Final.WSA_NAMESPACE);
if (addressing.required())
- addressingRequired = AddressingConstants.ADDRESSING_REQUIRED;
+ required.setValue(AddressingConstants.ADDRESSING_REQUIRED);
}
else if (submissionAddressingEnabled) {
namespace.setValue(AddressingConstants.Submission.WSA_NAMESPACE);
if (submissionAddressing.required())
- addressingRequired = AddressingConstants.ADDRESSING_REQUIRED;
+ required.setValue(AddressingConstants.ADDRESSING_REQUIRED);
}
else {
disabled.setValue("true");
@@ -102,7 +100,7 @@
namespace.setValue(AddressingConstants.Final.WSA_NAMESPACE);
if (addressing.required())
- addressingRequired = AddressingConstants.ADDRESSING_REQUIRED;
+ required.setValue(AddressingConstants.ADDRESSING_REQUIRED);
}
else {
namespace.setValue(AddressingConstants.Submission.WSA_NAMESPACE);
@@ -116,7 +114,7 @@
namespace.setValue(AddressingConstants.Submission.WSA_NAMESPACE);
if (submissionAddressing.required())
- addressingRequired = AddressingConstants.ADDRESSING_REQUIRED;
+ required.setValue(AddressingConstants.ADDRESSING_REQUIRED);
}
else {
namespace.setValue(AddressingConstants.Final.WSA_NAMESPACE);
@@ -128,9 +126,10 @@
}
try {
+ AxisService service = endpointDescription.getAxisService();
service.addParameter(namespace);
service.addParameter(disabled);
- AddressingHelper.setAddressingRequirementParemeterValue(service, addressingRequired);
+ service.addParameter(required);
String value = Utils.getParameterValue(disabled);
if (JavaUtils.isFalseExplicitly(value)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org