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

4 files changed, 12 insertions, 12 deletions

diff --git a/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
index f9de645a6e..1ad7a8f370 100644
--- a/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
+++ b/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
@@ -20,7 +20,7 @@ package org.apache.tuscany.sca.interfacedef;
 
 import java.util.List;
 
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+import org.apache.tuscany.sca.policy.PolicySubject;
 
 /**
  * Represents a service interface. This interface will typically be extended to
@@ -29,7 +29,7 @@ import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
  *
  * @version $Rev$ $Date$
  */
-public interface Interface extends Cloneable, PolicySetAttachPoint {
+public interface Interface extends Cloneable, PolicySubject {
 
     /**
      * Returns true if the interface is a remotable interface..
diff --git a/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
index 4676e35f80..e278fe1457 100644
--- a/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
+++ b/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
@@ -25,14 +25,14 @@ import javax.xml.namespace.QName;
 
 import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
 import org.apache.tuscany.sca.interfacedef.util.XMLType;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+import org.apache.tuscany.sca.policy.PolicySubject;
 
 /**
  * Represents an operation on a service interface.
  *
  * @version $Rev$ $Date$
  */
-public interface Operation extends Cloneable, PolicySetAttachPoint {
+public interface Operation extends Cloneable, PolicySubject {
     /**
      * Returns the name of the operation.
      * 
diff --git a/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
index e2a524c5e0..0890ca1664 100644
--- a/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
+++ b/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
@@ -27,7 +27,7 @@ import org.apache.tuscany.sca.interfacedef.Interface;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
 import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.ExtensionType;
 import org.apache.tuscany.sca.policy.PolicySet;
 
 /**
@@ -43,7 +43,7 @@ public class InterfaceImpl implements Interface {
     private boolean unresolved;
 
     private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    private IntentAttachPointType type;
+    private ExtensionType type;
     private List<PolicySet> policySets = new ArrayList<PolicySet>();
     private List<Intent> requiredIntents = new ArrayList<Intent>();
 
@@ -234,11 +234,11 @@ public class InterfaceImpl implements Interface {
         return requiredIntents;
     }
 
-    public IntentAttachPointType getType() {
+    public ExtensionType getType() {
         return type;
     }
 
-    public void setType(IntentAttachPointType type) {
+    public void setType(ExtensionType type) {
         this.type = type;
     }
 
diff --git a/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
index 00a5dc3065..2e0902e1bb 100644
--- a/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
+++ b/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
@@ -32,7 +32,7 @@ import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
 import org.apache.tuscany.sca.interfacedef.util.XMLType;
 import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.ExtensionType;
 import org.apache.tuscany.sca.policy.PolicySet;
 
 /**
@@ -58,7 +58,7 @@ public class OperationImpl implements Operation {
     private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
     private List<PolicySet> policySets = new ArrayList<PolicySet>();
     private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private IntentAttachPointType type;
+    private ExtensionType type;
 
     /**
      * @param name
@@ -328,11 +328,11 @@ public class OperationImpl implements Operation {
         return requiredIntents;
     }
 
-    public IntentAttachPointType getType() {
+    public ExtensionType getType() {
         return type;
     }
 
-    public void setType(IntentAttachPointType type) {
+    public void setType(ExtensionType type) {
         this.type = type;
     }