You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/10/17 23:36:28 UTC

svn commit: r705761 - in /tuscany/branches/sca-equinox/modules/binding-jsonrpc: ./ src/main/java/org/apache/tuscany/sca/binding/jsonrpc/ src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/ src/main/resources/META-INF/services/

Author: lresende
Date: Fri Oct 17 14:36:28 2008
New Revision: 705761

URL: http://svn.apache.org/viewvc?rev=705761&view=rev
Log:
Merging changes from trunk : 
   Updating JSON-RPC model to follow interface/factory pattern.
   Extending model to support policy

Added:
    tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
      - copied unchanged from r705760, tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
    tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/
      - copied from r705760, tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/
    tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
      - copied unchanged from r705760, tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
    tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
      - copied unchanged from r705760, tuscany/java/sca/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
    tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
      - copied unchanged from r705760, tuscany/java/sca/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
Modified:
    tuscany/branches/sca-equinox/modules/binding-jsonrpc/   (props changed)
    tuscany/branches/sca-equinox/modules/binding-jsonrpc/pom.xml
    tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
    tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor

Propchange: tuscany/branches/sca-equinox/modules/binding-jsonrpc/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 17 14:36:28 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/binding-jsonrpc:671193
+/tuscany/java/sca/modules/binding-jsonrpc:694855,700345-705760

Modified: tuscany/branches/sca-equinox/modules/binding-jsonrpc/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-jsonrpc/pom.xml?rev=705761&r1=705760&r2=705761&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-jsonrpc/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-jsonrpc/pom.xml Fri Oct 17 14:36:28 2008
@@ -38,6 +38,12 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-policy</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-interface-java</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>

Modified: tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java?rev=705761&r1=705760&r2=705761&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java Fri Oct 17 14:36:28 2008
@@ -20,44 +20,13 @@
 package org.apache.tuscany.sca.binding.jsonrpc;
 
 import org.apache.tuscany.sca.assembly.Binding;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
 
 /**
  * A model for the JSONRPC binding.
  * 
  * @version $Rev$ $Date$
  */
-public class JSONRPCBinding implements Binding {
-    private String name;
-    private String uri;
+public interface JSONRPCBinding extends Binding, PolicySetAttachPoint {
 
-    public String getName() {
-        return name;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public boolean isUnresolved() {
-        // The binding is always resolved
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // The binding is always resolved
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        // TODO Auto-generated method stub
-        return super.clone();
-    }
 }

Modified: tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=705761&r1=705760&r2=705761&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ tuscany/branches/sca-equinox/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Fri Oct 17 14:36:28 2008
@@ -16,4 +16,4 @@
 # under the License. 
 
 # Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.jsonrpc,model=org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding
+org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.jsonrpc,model=org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBinding,factory=org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory