Porting the JSONRPC model to 2.x + minor cleanups

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

2 files changed, 9 insertions, 45 deletions

diff --git a/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
index ce86365980..1e14502d93 100644
--- a/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
+++ b/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
@@ -19,14 +19,15 @@
 
 package org.apache.tuscany.sca.binding.jsonrpc;
 
+import javax.xml.namespace.QName;
+
 import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
 
 /**
  * A model for the JSONRPC binding.
  * 
  * @version $Rev$ $Date$
  */
-public interface JSONRPCBinding extends Binding, PolicySetAttachPoint {
-
+public interface JSONRPCBinding extends Binding {
+	QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.jsonrpc");
 }
diff --git a/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java b/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
index 1ee3631a98..1d1bd4ed43 100644
--- a/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
+++ b/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
@@ -19,12 +19,7 @@
 
 package org.apache.tuscany.sca.binding.jsonrpc.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
+import javax.xml.namespace.QName;
 
 import org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding;
 
@@ -37,12 +32,10 @@ public class JSONRPCBindingImpl implements JSONRPCBinding {
     private String name;
     private String uri;
 
-
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private IntentAttachPointType intentAttachPointType;
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-
+    public QName getType() {
+		return TYPE;
+	}
+    
     public String getName() {
         return name;
     }
@@ -68,36 +61,6 @@ public class JSONRPCBindingImpl implements JSONRPCBinding {
         // The binding is always resolved
     }
 
-    //Policy related getters/setters
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public IntentAttachPointType getType() {
-        return intentAttachPointType;
-    }
-
-    public void setType(IntentAttachPointType intentAttachPointType) {
-        this.intentAttachPointType = intentAttachPointType;
-    }
-
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets;
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
     @Override
     public Object clone() throws CloneNotSupportedException {
         return super.clone();