svn commit: r641194 - in /incubator/tuscany/branches/sca-java-1.2/modules: policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/ policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/

[svkrish]

Author: svkrish
Date: Wed Mar 26 01:11:02 2008
New Revision: 641194

URL: http://svn.apache.org/viewvc?rev=641194&view=rev
Log:
fixes to look at PolicySets instead of ApplicablePolicySets and also look into 
the PolicySets of operations

Modified:
    
incubator/tuscany/branches/sca-java-1.2/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
    
incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java

Modified: 
incubator/tuscany/branches/sca-java-1.2/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java?rev=641194&r1=641193&r2=641194&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.2/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.2/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
 Wed Mar 26 01:11:02 2008
@@ -19,7 +19,9 @@
 
 package org.apache.tuscany.sca.policy.logging.jdk;
 
+import org.apache.tuscany.sca.assembly.ConfiguredOperation;
 import org.apache.tuscany.sca.assembly.Implementation;
+import org.apache.tuscany.sca.assembly.OperationsConfigurator;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Phase;
@@ -44,14 +46,29 @@
         return "component.implementation: " + component.getURI() + "(" + 
implementation.getClass().getName() + ")";
     }
 
-    private PolicySet findPolicySet() {
-        for (PolicySet ps : component.getApplicablePolicySets()) {
+    private PolicySet findPolicySet(Operation operation) {
+        for (PolicySet ps : component.getPolicySets()) {
             for (Object p : ps.getPolicies()) {
                 if (JDKLoggingPolicy.class.isInstance(p)) {
                     return ps;
                 }
             }
         }
+        
+        if ( component instanceof OperationsConfigurator ) {
+               for ( ConfiguredOperation confOp : 
((OperationsConfigurator)component).getConfiguredOperations() ) {
+                       if ( confOp.getName().equals(operation.getName())) {
+                               for (PolicySet ps : confOp.getPolicySets()) {
+                           for (Object p : ps.getPolicies()) {
+                               if (JDKLoggingPolicy.class.isInstance(p)) {
+                                   return ps;
+                               }
+                           }
+                       }
+                       }
+               }
+        }
+        
         return null;
     }
 
@@ -59,7 +76,7 @@
      * @see 
org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation)
      */
     public Interceptor createInterceptor(Operation operation) {
-        PolicySet ps = findPolicySet();
+        PolicySet ps = findPolicySet(operation);
         return ps == null ? null : new 
JDKLoggingPolicyInterceptor(getContext(), operation, ps);
     }
 
@@ -67,7 +84,7 @@
      * @see org.apache.tuscany.sca.provider.PolicyProvider#getPhase()
      */
     public String getPhase() {
-        return Phase.SERVICE_POLICY;
+        return Phase.IMPLEMENTATION_POLICY;
     }
 
 }

Modified: 
incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java?rev=641194&r1=641193&r2=641194&view=diff
==============================================================================
--- 
incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
 (original)
+++ 
incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
 Wed Mar 26 01:11:02 2008
@@ -52,11 +52,11 @@
             OperationsConfigurator operationsConfigurator = 
(OperationsConfigurator)implementation;
             for (ConfiguredOperation cop : 
operationsConfigurator.getConfiguredOperations()) {
                 if (cop.getName().equals(op.getName())) {
-                    cop.getApplicablePolicySets();
+                    cop.getPolicySets();
                 }
             }
         }
-        List<PolicySet> policySets = component.getApplicablePolicySets();
+        List<PolicySet> policySets = component.getPolicySets();
         for (PolicySet ps : policySets) {
             for (Object p : ps.getPolicies()) {
                 if (JaasAuthenticationPolicy.class.isInstance(p)) {
@@ -77,6 +77,6 @@
     }
 
     public String getPhase() {
-        return Phase.SERVICE_POLICY;
+        return Phase.IMPLEMENTATION_POLICY;
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]