tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r440454 - in /incubator/tuscany/java: samples/sca/echo.binding/src/main/java/echo/ sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/ sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/ sca/b...
Date Tue, 05 Sep 2006 19:30:43 GMT
Author: rfeng
Date: Tue Sep  5 12:30:42 2006
New Revision: 440454

URL: http://svn.apache.org/viewvc?view=rev&rev=440454
Log:
Enforce the return types to be Service/Reference of methods on BindingBuilder and BindlessBuilder

Modified:
    incubator/tuscany/java/samples/sca/echo.binding/src/main/java/echo/EchoBuilder.java
    incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java
    incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindlessBuilder.java
    incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
    incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java

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=440454&r1=440453&r2=440454
==============================================================================
--- 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
Sep  5 12:30:42 2006
@@ -19,7 +19,8 @@
 package echo;
 
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.extension.BindingBuilderExtension;
 import org.apache.tuscany.spi.model.BoundReferenceDefinition;
@@ -30,7 +31,7 @@
  */
 public class EchoBuilder extends BindingBuilderExtension<EchoBinding> {
 
-    public SCAObject build(CompositeComponent parent,
+    public Reference<?> build(CompositeComponent parent,
                            BoundReferenceDefinition<EchoBinding> definition,
                            DeploymentContext context) {
         Class<?> interfaze = definition.getServiceContract().getInterfaceClass();
@@ -38,7 +39,7 @@
         return new EchoReference(name, interfaze, parent, wireService);
     }
 
-    public SCAObject build(CompositeComponent parent,
+    public Service<?> build(CompositeComponent parent,
                            BoundServiceDefinition<EchoBinding> definition,
                            DeploymentContext context) {
         Class<?> interfaze = definition.getServiceContract().getInterfaceClass();

Modified: incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java?view=diff&rev=440454&r1=440453&r2=440454
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
(original)
+++ incubator/tuscany/java/sca/bindings/binding.axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2BindingBuilder.java
Tue Sep  5 12:30:42 2006
@@ -24,7 +24,8 @@
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.apache.tuscany.spi.builder.BuilderConfigException;
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.extension.BindingBuilderExtension;
 import org.apache.tuscany.spi.host.ServletHost;
@@ -54,7 +55,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    public SCAObject build(CompositeComponent parent, BoundServiceDefinition<WebServiceBinding>
serviceDefinition, DeploymentContext deploymentContext) {
+    public Service<?> build(CompositeComponent parent, BoundServiceDefinition<WebServiceBinding>
serviceDefinition, DeploymentContext deploymentContext) {
 
         WebServiceBinding wsBinding = serviceDefinition.getBinding();
         Class<?> interfaze = serviceDefinition.getServiceContract().getInterfaceClass();
@@ -65,7 +66,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    public SCAObject build(CompositeComponent parent, BoundReferenceDefinition<WebServiceBinding>
boundReferenceDefinition,
+    public Reference<?> build(CompositeComponent parent, BoundReferenceDefinition<WebServiceBinding>
boundReferenceDefinition,
             DeploymentContext deploymentContext) {
         
         WebServiceBinding wsBinding = boundReferenceDefinition.getBinding();

Modified: incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java?view=diff&rev=440454&r1=440453&r2=440454
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java
(original)
+++ incubator/tuscany/java/sca/bindings/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/CeltixBindingBuilder.java
Tue Sep  5 12:30:42 2006
@@ -21,16 +21,17 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
+import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry;
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.extension.BindingBuilderExtension;
 import org.apache.tuscany.spi.model.BoundReferenceDefinition;
 import org.apache.tuscany.spi.model.BoundServiceDefinition;
+import org.objectweb.celtix.Bus;
 
 import commonj.sdo.helper.TypeHelper;
-import org.apache.tuscany.idl.wsdl.WSDLDefinitionRegistry;
-import org.objectweb.celtix.Bus;
 
 /**
  * Builds a {@link org.apache.tuscany.spi.component.Service} or {@link org.apache.tuscany.spi.component.Reference}
@@ -42,7 +43,7 @@
 
     private Bus bus;
 
-    public SCAObject build(CompositeComponent parent,
+    public Service<?> build(CompositeComponent parent,
                            BoundServiceDefinition<WebServiceBinding> boundServiceDefinition,
                            DeploymentContext deploymentContext) {
         WebServiceBinding wsBinding = boundServiceDefinition.getBinding();
@@ -63,7 +64,7 @@
             typeHelper);
     }
 
-    public SCAObject build(CompositeComponent parent,
+    public Reference<?> build(CompositeComponent parent,
                            BoundReferenceDefinition<WebServiceBinding> boundReferenceDefinition,
                            DeploymentContext deploymentContext) {
         WebServiceBinding wsBinding = boundReferenceDefinition.getBinding();

Modified: incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java?view=diff&rev=440454&r1=440453&r2=440454
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java
(original)
+++ incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java
Tue Sep  5 12:30:42 2006
@@ -21,7 +21,8 @@
 import org.apache.tuscany.host.rmi.RMIHost;
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.extension.BindingBuilderExtension;
 import org.apache.tuscany.spi.model.BoundReferenceDefinition;
@@ -48,7 +49,7 @@
     }
 
     @SuppressWarnings({"unchecked"})
-    public SCAObject build(CompositeComponent parent,
+    public Service<?> build(CompositeComponent parent,
                            BoundServiceDefinition<RMIBinding> boundServiceDefinition,
                            DeploymentContext deploymentContext) {
 
@@ -60,7 +61,7 @@
     }
 
     @SuppressWarnings({"unchecked"})
-    public RMIReference build(CompositeComponent parent,
+    public Reference<?> build(CompositeComponent parent,
                               BoundReferenceDefinition<RMIBinding> boundReferenceDefinition,
                               DeploymentContext deploymentContext) {
         String name = boundReferenceDefinition.getName();

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java?view=diff&rev=440454&r1=440453&r2=440454
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java
(original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeBindlessBuilder.java
Tue Sep  5 12:30:42 2006
@@ -15,18 +15,18 @@
  */
 package org.apache.tuscany.core.implementation.composite;
 
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-
 import org.apache.tuscany.spi.annotation.Autowire;
 import org.apache.tuscany.spi.builder.BindlessBuilder;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.model.BindlessServiceDefinition;
 import org.apache.tuscany.spi.model.ReferenceDefinition;
 import org.apache.tuscany.spi.wire.WireService;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Scope;
 
 @Scope("MODULE")
 public class CompositeBindlessBuilder implements BindlessBuilder {
@@ -49,7 +49,7 @@
         builderRegistry.register(this);
     }
 
-    public SCAObject build(CompositeComponent parent,
+    public Service<?> build(CompositeComponent parent,
                            BindlessServiceDefinition definition,
                            DeploymentContext deploymentContext) {
         return new CompositeService(definition.getName(),
@@ -58,7 +58,7 @@
             wireService);
     }
 
-    public SCAObject build(CompositeComponent parent,
+    public Reference<?> build(CompositeComponent parent,
                            ReferenceDefinition definition,
                            DeploymentContext deploymentContext) {
         return new CompositeReference(definition.getName(), parent, wireService, definition.getServiceContract());

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java?view=diff&rev=440454&r1=440453&r2=440454
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java
(original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemBindingBuilder.java
Tue Sep  5 12:30:42 2006
@@ -23,6 +23,8 @@
 import org.apache.tuscany.spi.builder.BuilderConfigException;
 import org.apache.tuscany.spi.component.Component;
 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.deployer.DeploymentContext;
 import org.apache.tuscany.spi.model.BoundReferenceDefinition;
 import org.apache.tuscany.spi.model.BoundServiceDefinition;
@@ -47,7 +49,7 @@
  */
 public class SystemBindingBuilder implements BindingBuilder<SystemBinding> {
 
-    public SystemService build(CompositeComponent parent,
+    public Service<?> build(CompositeComponent parent,
                                BoundServiceDefinition<SystemBinding> boundServiceDefinition,
                                DeploymentContext deploymentContext) {
         Class interfaze = boundServiceDefinition.getServiceContract().getInterfaceClass();
@@ -66,7 +68,7 @@
         return service;
     }
 
-    public SystemReference build(CompositeComponent parent,
+    public Reference<?> build(CompositeComponent parent,
                                  BoundReferenceDefinition<SystemBinding> boundReferenceDefinition,
                                  DeploymentContext deploymentContext) {
         assert parent.getParent() instanceof AutowireComponent

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java?view=diff&rev=440454&r1=440453&r2=440454
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
(original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindingBuilder.java
Tue Sep  5 12:30:42 2006
@@ -19,7 +19,8 @@
 package org.apache.tuscany.spi.builder;
 
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.model.Binding;
 import org.apache.tuscany.spi.model.BoundReferenceDefinition;
@@ -33,11 +34,11 @@
  * @version $Rev$ $Date$
  */
 public interface BindingBuilder<B extends Binding> {
-    SCAObject build(CompositeComponent parent,
+    Service<?> build(CompositeComponent parent,
                     BoundServiceDefinition<B> boundServiceDefinition,
                     DeploymentContext deploymentContext);
 
-    SCAObject build(CompositeComponent parent,
+    Reference<?> build(CompositeComponent parent,
                     BoundReferenceDefinition<B> boundReferenceDefinition,
                     DeploymentContext deploymentContext);
 }

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindlessBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindlessBuilder.java?view=diff&rev=440454&r1=440453&r2=440454
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindlessBuilder.java
(original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/BindlessBuilder.java
Tue Sep  5 12:30:42 2006
@@ -19,7 +19,8 @@
 package org.apache.tuscany.spi.builder;
 
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.model.BindlessServiceDefinition;
 import org.apache.tuscany.spi.model.ReferenceDefinition;
@@ -33,11 +34,11 @@
  */
 public interface BindlessBuilder {
 
-    SCAObject build(CompositeComponent parent,
+    Service<?> build(CompositeComponent parent,
                     BindlessServiceDefinition serviceDefinition,
                     DeploymentContext deploymentContext);
 
-    SCAObject build(CompositeComponent parent,
+    Reference<?> build(CompositeComponent parent,
                     ReferenceDefinition referenceDefinition,
                     DeploymentContext deploymentContext);
 }

Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java?view=diff&rev=440454&r1=440453&r2=440454
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
(original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/BindingBuilderExtension.java
Tue Sep  5 12:30:42 2006
@@ -25,7 +25,8 @@
 import org.apache.tuscany.spi.builder.BindingBuilder;
 import org.apache.tuscany.spi.builder.BuilderRegistry;
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.model.Binding;
 import org.apache.tuscany.spi.model.BoundReferenceDefinition;
@@ -59,13 +60,13 @@
         builderRegistry.register(getBindingType(), this);
     }
 
-    public SCAObject build(CompositeComponent parent,
+    public Service<?> build(CompositeComponent parent,
                            BoundServiceDefinition<B> boundServiceDefinition,
                            DeploymentContext deploymentContext) {
         return null;
     }
 
-    public SCAObject build(CompositeComponent parent,
+    public Reference<?> build(CompositeComponent parent,
                            BoundReferenceDefinition<B> boundReferenceDefinition,
                            DeploymentContext deploymentContext) {
         return null;

Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java?view=diff&rev=440454&r1=440453&r2=440454
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java
(original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/binding/TestBindingBuilder.java
Tue Sep  5 12:30:42 2006
@@ -19,7 +19,8 @@
 package org.apache.tuscany.test.binding;
 
 import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.SCAObject;
+import org.apache.tuscany.spi.component.Reference;
+import org.apache.tuscany.spi.component.Service;
 import org.apache.tuscany.spi.deployer.DeploymentContext;
 import org.apache.tuscany.spi.extension.BindingBuilderExtension;
 import org.apache.tuscany.spi.model.BoundServiceDefinition;
@@ -31,7 +32,7 @@
 public class TestBindingBuilder extends BindingBuilderExtension<TestBinding> {
 
     @SuppressWarnings("unchecked")
-    public SCAObject build(CompositeComponent parent,
+    public Service<?> build(CompositeComponent parent,
                            BoundServiceDefinition<TestBinding> definition,
                            DeploymentContext context) {
         Class<?> interfaze = definition.getServiceContract().getInterfaceClass();
@@ -39,7 +40,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    public SCAObject build(CompositeComponent parent,
+    public Reference<?> build(CompositeComponent parent,
                                BoundReferenceDefinition<TestBinding> definition,
                                DeploymentContext context) {
         Class<?> interfaze = definition.getServiceContract().getInterfaceClass();



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


Mime
View raw message