summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2011-02-25 10:19:00 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2011-02-25 10:19:00 +0000
commitc03e0af6609e33f04e995d4b0df63789072d62ef (patch)
treedec1a1d68b45bf4c50af328a77f6ddf38a729b80
parentd9d7bcb8658913ed3f64cf9faaecc6d070e3054a (diff)
Move the binding/policy configuration step to after the Axis config context has been created.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1074465 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java
index 20f5e004cc..fb9bcb12f8 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java
@@ -120,11 +120,7 @@ public class Axis2ReferenceBindingProvider extends Axis2BaseBindingProvider impl
PolicyHelper.isIntentRequired(wsBinding, Constants.CONFIDENTIALITY_INTENT) ||
PolicyHelper.isIntentRequired(wsBinding, Constants.INTEGRITY_INTENT);
- // Apply the configuration from any other policies
-
- for (PolicyProvider pp : this.endpointReference.getPolicyProviders()) {
- pp.configureBinding(this);
- }
+ // Validate the configuration for provided policies
// check the WSDL style as we currently only support some of them
if (wsBinding.isRpcEncoded()){
@@ -169,6 +165,12 @@ public class Axis2ReferenceBindingProvider extends Axis2BaseBindingProvider impl
public void start() {
configContext = Axis2EngineIntegration.getAxisConfigurationContext(extensionPoints.getServiceDiscovery());
+ // Apply the configuration from any other policies
+
+ for (PolicyProvider pp : this.endpointReference.getPolicyProviders()) {
+ pp.configureBinding(this);
+ }
+
try {
Definition definition = wsBinding.getGeneratedWSDLDocument();
QName serviceQName = wsBinding.getService().getQName();