Start to implement the SCA policy framework 1.1 spec draft from OASIS OpenCSA

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

11 files changed, 23 insertions, 32 deletions

diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
index 152a8de6cc..7e86e996bf 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
@@ -20,15 +20,13 @@ package org.apache.tuscany.sca.policy.authentication.basic;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.policy.Policy;
-
 /**
  * Implementation for policies that could be injected as parameter
  * into the axis2config.
  *
  * @version $Rev$ $Date$
  */
-public class BasicAuthenticationPolicy implements Policy {
+public class BasicAuthenticationPolicy {
     private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
 
     public static final QName BASIC_AUTHENTICATION_POLICY_QNAME = new QName(SCA10_TUSCANY_NS, "basicAuthentication");
diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
index 5aa36ecc89..c5352e1f57 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
@@ -26,7 +26,7 @@ import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Phase;
 import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+import org.apache.tuscany.sca.policy.PolicySubject;
 import org.apache.tuscany.sca.provider.PolicyProvider;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
@@ -49,8 +49,8 @@ public class BasicAuthenticationReferencePolicyProvider implements PolicyProvide
     }
 
     private PolicySet findPolicySet() {
-        if (binding instanceof PolicySetAttachPoint) {
-            List<PolicySet> policySets = ((PolicySetAttachPoint)binding).getApplicablePolicySets();
+        if (binding instanceof PolicySubject) {
+            List<PolicySet> policySets = ((PolicySubject)binding).getPolicySets();
             for (PolicySet ps : policySets) {
                 for (Object p : ps.getPolicies()) {
                     if (BasicAuthenticationPolicy.class.isInstance(p)) {
diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
index aae0386589..b8684e29c0 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
@@ -26,7 +26,7 @@ import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Interceptor;
 import org.apache.tuscany.sca.invocation.Phase;
 import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+import org.apache.tuscany.sca.policy.PolicySubject;
 import org.apache.tuscany.sca.provider.PolicyProvider;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.apache.tuscany.sca.runtime.RuntimeComponentService;
@@ -47,8 +47,8 @@ public class BasicAuthenticationServicePolicyProvider implements PolicyProvider
     }
 
     private PolicySet findPolicySet() {
-        if (binding instanceof PolicySetAttachPoint) {
-            List<PolicySet> policySets = ((PolicySetAttachPoint)binding).getApplicablePolicySets();
+        if (binding instanceof PolicySubject) {
+            List<PolicySet> policySets = ((PolicySubject)binding).getPolicySets();
             for (PolicySet ps : policySets) {
                 for (Object p : ps.getPolicies()) {
                     if (BasicAuthenticationPolicy.class.isInstance(p)) {
diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
index dfb6fee180..89b8ed29d8 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
@@ -24,14 +24,12 @@ import java.util.List;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.policy.Policy;
-
 /**
  * Models the SCA Implementation Security Policy Assertion for Authorization.
  * 
  * @version $Rev$ $Date$
  */
-public class AuthorizationPolicy implements Policy {
+public class AuthorizationPolicy {
     private final static String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
     // private final static String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
     public static final QName NAME = new QName(SCA10_NS, "authorization");
diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
index aa52e0bc41..38feea21b5 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
@@ -21,9 +21,7 @@ package org.apache.tuscany.sca.policy.identity;
 import java.util.ArrayList;
 import java.util.List;
 
-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;
@@ -46,6 +44,7 @@ public class SecurityIdentityImplementationPolicyProvider implements PolicyProvi
 
     private List<SecurityIdentityPolicy> findPolicies(Operation op) {
         List<SecurityIdentityPolicy> polices = new ArrayList<SecurityIdentityPolicy>();
+        /*
         // FIXME: How do we get a list of effective policySets for a given operation?
         if (implementation instanceof OperationsConfigurator) {
             OperationsConfigurator operationsConfigurator = (OperationsConfigurator)implementation;
@@ -61,6 +60,7 @@ public class SecurityIdentityImplementationPolicyProvider implements PolicyProvi
                 }
             }
         }
+        */
         
         List<PolicySet> policySets = component.getPolicySets();
         for (PolicySet ps : policySets) {
diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
index e4c4794c52..9d0094ee4b 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
@@ -21,14 +21,12 @@ package org.apache.tuscany.sca.policy.identity;
 
 import javax.xml.namespace.QName;
 
-import org.apache.tuscany.sca.policy.Policy;
-
 /**
  * Models the SCA Implementation Security Policy Assertion for Security Identity.
  * 
  * @version $Rev$ $Date$
  */
-public class SecurityIdentityPolicy implements Policy {
+public class SecurityIdentityPolicy {
     private final static String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";    
     public static final QName NAME = new QName(SCA10_NS, "securityIdentity");
 
diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
index 185982a749..203d9ca0ab 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
@@ -21,9 +21,7 @@ package org.apache.tuscany.sca.policy.security.jaas;
 import java.util.ArrayList;
 import java.util.List;
 
-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;
@@ -48,6 +46,7 @@ public class JaasAuthenticationImplementationPolicyProvider implements PolicyPro
 
     private List<JaasAuthenticationPolicy> findPolicies(Operation op) {
         List<JaasAuthenticationPolicy> polices = new ArrayList<JaasAuthenticationPolicy>();
+        /*
         // FIXME: How do we get a list of effective policySets for a given operation?
         if (implementation instanceof OperationsConfigurator) {
             OperationsConfigurator operationsConfigurator = (OperationsConfigurator)implementation;
@@ -63,6 +62,7 @@ public class JaasAuthenticationImplementationPolicyProvider implements PolicyPro
                 }
             }
         }
+        */
         
         List<PolicySet> policySets = component.getPolicySets();
         for (PolicySet ps : policySets) {
diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
index e1ef32f36c..20f9e38f11 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
@@ -21,13 +21,11 @@ package org.apache.tuscany.sca.policy.security.jaas;
 

 import javax.xml.namespace.QName;

 

-import org.apache.tuscany.sca.policy.Policy;

-

 /**

  *

  * @version $Rev$ $Date$

  */

-public class JaasAuthenticationPolicy implements Policy {

+public class JaasAuthenticationPolicy {

     private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";

     public static final QName NAME = new QName(SCA10_TUSCANY_NS, "jaasAuthentication");

 

diff --git a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
index edff316700..5bd19e5c69 100644
--- a/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
+++ b/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
@@ -24,14 +24,13 @@ import javax.security.auth.login.LoginContext;
 import javax.xml.namespace.QName;

 

 import org.apache.tuscany.sca.policy.PolicySet;

-import org.apache.tuscany.sca.policy.util.PolicyHandler;

 

 /**

  * Policy handler to handle PolicySet containing JaasAuthenticationPolicy instances

  *

  * @version $Rev$ $Date$

  */

-public class JaasAuthenticationPolicyHandler implements PolicyHandler {

+public class JaasAuthenticationPolicyHandler {

     private static final String jaasPolicy = "JaasPolicy";

     private static final String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";

     public static final QName policySetQName = new QName(SCA10_TUSCANY_NS, jaasPolicy);

diff --git a/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
index f8f0634a9a..0e9e050bd4 100644
--- a/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
+++ b/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 			targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+ 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200712"
+ 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712"
  			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
 
     <!-- POLICY SETS -->
@@ -31,7 +31,7 @@
     
 	<!-- Policy Intents Defined by the SCA Runtime -->
 	<intent name="authentication" 
-	 		constrains="sca:binding tuscany:binding">
+	 		constrains="sca:binding">
 		<description>
 			Specifying this intent on references requires necessary authentication information
 			to be sent along with outgoing messages. Specifying this intent on service requires
@@ -40,14 +40,14 @@
 	</intent>
 	
 	<intent name="confidentiality" 
-	 		constrains="sca:binding tuscany:binding">
+	 		constrains="sca:binding">
 		<description>
 			Specifying this intent requires message exchanged to be encrypted
 		</description>
 	</intent>
 	
 	<intent name="integrity" 
-	 		constrains="sca:binding tuscany:binding">
+	 		constrains="sca:binding">
 		<description>
 			Specifying this intent requires message exchanged to be signed
 		</description>
diff --git a/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml b/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
index 91383eaf6a..0ae105c755 100644
--- a/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
+++ b/java/sca/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
@@ -17,8 +17,8 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
 
     <intent name="identity" constrains="sca:implementation.java 
                                         sca:implementation.spring">