Fix up the basic auth policy provider

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@909490 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 4 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
index 6cfe8e1a84..3d73410ae9 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
@@ -30,6 +30,7 @@ import org.apache.tuscany.sca.invocation.Invoker;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.invocation.Phase;
 import org.apache.tuscany.sca.invocation.PhasedInterceptor;
+import org.apache.tuscany.sca.policy.PolicyExpression;
 import org.apache.tuscany.sca.policy.PolicySet;
 import org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicy;
 import org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPrincipal;
@@ -59,10 +60,12 @@ public class BasicAuthenticationServicePolicyInterceptor implements PhasedInterc
     }
 
     private void init() {
+        // TODO - how to get the appropriate expression out of the
+        //        policy set. Need WS Policy help here
         if (policySet != null) {
-            for (Object policyObject : policySet.getPolicies()){
-                if (policyObject instanceof BasicAuthenticationPolicy){
-                    policy = (BasicAuthenticationPolicy)policyObject;
+            for (PolicyExpression policyExpression : policySet.getPolicies()){
+                if (policyExpression.getPolicy() instanceof BasicAuthenticationPolicy){
+                    policy = (BasicAuthenticationPolicy)policyExpression.getPolicy();
                     break;
                 }
             }
@@ -114,7 +117,7 @@ public class BasicAuthenticationServicePolicyInterceptor implements PhasedInterc
     }
 
     public String getPhase() {
-        return Phase.SERVICE_POLICY;
+        return Phase.SERVICE_BINDING_POLICY;
     }
     
 }