You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/01/02 19:57:21 UTC

svn commit: r491895 - in /incubator/tuscany/java/samples/sca: echo.binding/src/main/java/echo/ echo.databinding/src/main/java/echo/

Author: rfeng
Date: Tue Jan  2 10:57:18 2007
New Revision: 491895

URL: http://svn.apache.org/viewvc?view=rev&rev=491895
Log:
Fix echo binding to use the latest SPI

Modified:
    incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoBinding.java
    incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoBuilder.java
    incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoReference.java
    incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoService.java
    incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoBinding.java
    incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoBuilder.java
    incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoReference.java
    incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoService.java

Modified: incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoBinding.java?view=diff&rev=491895&r1=491894&r2=491895
==============================================================================
--- incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoBinding.java (original)
+++ incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoBinding.java Tue Jan  2 10:57:18 2007
@@ -18,11 +18,11 @@
  */
 package echo;
 
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
 
 /**
  * @version $Rev$ $Date$
  */
-public class EchoBinding extends Binding {
+public class EchoBinding extends BindingDefinition {
 
 }

Modified: incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoBuilder.java?view=diff&rev=491895&r1=491894&r2=491895
==============================================================================
--- incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoBuilder.java (original)
+++ incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoBuilder.java Tue Jan  2 10:57:18 2007
@@ -18,9 +18,10 @@
  */
 package echo;
 
+import org.apache.tuscany.spi.builder.BuilderException;
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.Reference;
-import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.ReferenceBinding;
+import org.apache.tuscany.spi.component.ServiceBinding;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.extension.BindingBuilderExtension;
 import org.apache.tuscany.spi.model.BoundReferenceDefinition;
@@ -31,17 +32,18 @@
  */
 public class EchoBuilder extends BindingBuilderExtension<EchoBinding> {
 
-    public Reference build(CompositeComponent parent,
-                           BoundReferenceDefinition<EchoBinding> definition,
-                           DeploymentContext context) {
-        String name = definition.getName();
-        return new EchoReference(name, parent);
+    public ServiceBinding build(CompositeComponent parent,
+                                BoundServiceDefinition boundServiceDefinition,
+                                EchoBinding bindingDefinition,
+                                DeploymentContext deploymentContext) throws BuilderException {
+        return new EchoService(boundServiceDefinition.getName(), parent);
     }
 
-    public Service build(CompositeComponent parent,
-                           BoundServiceDefinition<EchoBinding> definition,
-                           DeploymentContext context) {
-        return new EchoService(definition.getName(), parent);
+    public ReferenceBinding build(CompositeComponent parent,
+                                  BoundReferenceDefinition boundReferenceDefinition,
+                                  EchoBinding bindingDefinition,
+                                  DeploymentContext deploymentContext) throws BuilderException {
+        return new EchoReference(boundReferenceDefinition.getName(), parent);
     }
 
     protected Class<EchoBinding> getBindingType() {

Modified: incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoReference.java?view=diff&rev=491895&r1=491894&r2=491895
==============================================================================
--- incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoReference.java (original)
+++ incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoReference.java Tue Jan  2 10:57:18 2007
@@ -19,16 +19,15 @@
 package echo;
 
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.extension.ReferenceExtension;
+import org.apache.tuscany.spi.extension.ReferenceBindingExtension;
 import org.apache.tuscany.spi.model.Operation;
 import org.apache.tuscany.spi.model.ServiceContract;
 import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.WireService;
 
 /**
  * @version $Rev$ $Date$
  */
-public class EchoReference extends ReferenceExtension {
+public class EchoReference extends ReferenceBindingExtension {
 
     public EchoReference(String name, CompositeComponent parent) {
         super(name, parent);

Modified: incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoService.java?view=diff&rev=491895&r1=491894&r2=491895
==============================================================================
--- incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoService.java (original)
+++ incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoService.java Tue Jan  2 10:57:18 2007
@@ -18,15 +18,14 @@
  */
 package echo;
 
-import org.apache.tuscany.spi.extension.ServiceExtension;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.wire.WireService;
 import org.apache.tuscany.spi.CoreRuntimeException;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
 
 /**
  * @version $Rev$ $Date$
  */
-public class EchoService extends ServiceExtension {
+public class EchoService extends ServiceBindingExtension {
     public EchoService(String name,
                        CompositeComponent parent) throws CoreRuntimeException {
         super(name, parent);

Modified: incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoBinding.java?view=diff&rev=491895&r1=491894&r2=491895
==============================================================================
--- incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoBinding.java (original)
+++ incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoBinding.java Tue Jan  2 10:57:18 2007
@@ -18,11 +18,11 @@
  */
 package echo;
 
-import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BindingDefinition;
 
 /**
  * @version $Rev$ $Date$
  */
-public class EchoBinding extends Binding {
+public class EchoBinding extends BindingDefinition {
 
 }

Modified: incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoBuilder.java?view=diff&rev=491895&r1=491894&r2=491895
==============================================================================
--- incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoBuilder.java (original)
+++ incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoBuilder.java Tue Jan  2 10:57:18 2007
@@ -18,9 +18,10 @@
  */
 package echo;
 
+import org.apache.tuscany.spi.builder.BuilderException;
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.Reference;
-import org.apache.tuscany.spi.component.Service;
+import org.apache.tuscany.spi.component.ReferenceBinding;
+import org.apache.tuscany.spi.component.ServiceBinding;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.extension.BindingBuilderExtension;
 import org.apache.tuscany.spi.model.BoundReferenceDefinition;
@@ -31,19 +32,18 @@
  */
 public class EchoBuilder extends BindingBuilderExtension<EchoBinding> {
 
-    public Reference build(CompositeComponent parent,
-                           BoundReferenceDefinition<EchoBinding> definition,
-                           DeploymentContext context) {
-        Class<?> interfaze = definition.getServiceContract().getInterfaceClass();
-        String name = definition.getName();
-        return new EchoReference(name, interfaze, parent, wireService);
+    public ServiceBinding build(CompositeComponent parent,
+                                BoundServiceDefinition boundServiceDefinition,
+                                EchoBinding bindingDefinition,
+                                DeploymentContext deploymentContext) throws BuilderException {
+        return new EchoService(boundServiceDefinition.getName(), parent);
     }
 
-    public Service build(CompositeComponent parent,
-                           BoundServiceDefinition<EchoBinding> definition,
-                           DeploymentContext context) {
-        Class<?> interfaze = definition.getServiceContract().getInterfaceClass();
-        return new EchoService(definition.getName(), interfaze, parent, wireService);
+    public ReferenceBinding build(CompositeComponent parent,
+                                  BoundReferenceDefinition boundReferenceDefinition,
+                                  EchoBinding bindingDefinition,
+                                  DeploymentContext deploymentContext) throws BuilderException {
+        return new EchoReference(boundReferenceDefinition.getName(), parent);
     }
 
     protected Class<EchoBinding> getBindingType() {

Modified: incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoReference.java?view=diff&rev=491895&r1=491894&r2=491895
==============================================================================
--- incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoReference.java (original)
+++ incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoReference.java Tue Jan  2 10:57:18 2007
@@ -20,21 +20,20 @@
 
 import org.apache.axiom.om.OMElement;
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.extension.ReferenceExtension;
+import org.apache.tuscany.spi.extension.ReferenceBindingExtension;
 import org.apache.tuscany.spi.model.Operation;
 import org.apache.tuscany.spi.model.ServiceContract;
 import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.spi.wire.WireService;
 
 /**
  * @version $Rev$ $Date$
  */
-public class EchoReference extends ReferenceExtension {
+public class EchoReference extends ReferenceBindingExtension {
 
     private static final String OM_DATA_BINDING = OMElement.class.getName();
 
-    public EchoReference(String name, Class<?> interfaze, CompositeComponent parent, WireService wireService) {
-        super(name, interfaze, parent, wireService);
+    public EchoReference(String name, CompositeComponent parent) {
+        super(name, parent);
     }
 
     @SuppressWarnings("unchecked")

Modified: incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoService.java?view=diff&rev=491895&r1=491894&r2=491895
==============================================================================
--- incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoService.java (original)
+++ incubator/tuscany/java/samples/sca/echo.databinding/src/main/java/echo/EchoService.java Tue Jan  2 10:57:18 2007
@@ -18,20 +18,15 @@
  */
 package echo;
 
-import org.apache.tuscany.spi.extension.ServiceExtension;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.wire.WireService;
 import org.apache.tuscany.spi.CoreRuntimeException;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.extension.ServiceBindingExtension;
 
 /**
  * @version $Rev$ $Date$
  */
-public class EchoService extends ServiceExtension {
-    public EchoService(String name,
-                       Class<?> interfaze,
-                       CompositeComponent parent,
-                       WireService wireService) throws CoreRuntimeException {
-        super(name, interfaze, parent, wireService);
-        // do nothing, but this could register with the host environment
+public class EchoService extends ServiceBindingExtension {
+    public EchoService(String name, CompositeComponent parent) throws CoreRuntimeException {
+        super(name, parent);
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org