svn commit: r398829 - in /incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder: ExternalWebServiceBuilder.java ExternalWebServiceWireBuilder.java WebServiceEntryPointBuilder.java

[jm...@apache.org]

Author: jmarino
Date: Mon May  1 23:50:19 2006
New Revision: 398829

URL: http://svn.apache.org/viewcvs?rev=398829&view=rev
Log:
refactors to entrypoint and external service builders  use generics instrad of having subclasses implement handlesTargetType

Modified:
    incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceBuilder.java
    incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceWireBuilder.java
    incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/WebServiceEntryPointBuilder.java

Modified: incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceBuilder.java?rev=398829&r1=398828&r2=398829&view=diff
==============================================================================
--- incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceBuilder.java (original)
+++ incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceBuilder.java Mon May  1 23:50:19 2006
@@ -20,7 +20,6 @@
 import org.apache.tuscany.core.builder.impl.ExternalServiceContextFactory;
 import org.apache.tuscany.core.extension.ExternalServiceBuilderSupport;
 import org.apache.tuscany.core.injection.SingletonObjectFactory;
-import org.apache.tuscany.model.assembly.Binding;
 import org.apache.tuscany.model.assembly.ExternalService;
 import org.objectweb.celtix.Bus;
 import org.osoa.sca.annotations.Init;
@@ -34,7 +33,7 @@
  * @version $Rev$ $Date$
  */
 @Scope("MODULE")
-public class ExternalWebServiceBuilder extends ExternalServiceBuilderSupport {
+public class ExternalWebServiceBuilder extends ExternalServiceBuilderSupport<WebServiceBinding> {
 
     private Bus bus;
 
@@ -43,10 +42,6 @@
     public void init() throws Exception {
         super.init();
         bus = Bus.init();
-    }
-
-    protected boolean handlesBindingType(Binding binding) {
-        return binding instanceof WebServiceBinding;
     }
 
     protected ExternalServiceContextFactory createExternalServiceContextFactory(

Modified: incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceWireBuilder.java?rev=398829&r1=398828&r2=398829&view=diff
==============================================================================
--- incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceWireBuilder.java (original)
+++ incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceWireBuilder.java Mon May  1 23:50:19 2006
@@ -26,11 +26,7 @@
 
 
 @Scope("MODULE")
-public class ExternalWebServiceWireBuilder extends WireBuilderSupport {
-
-    protected boolean handlesTargetType(Class targetType) {
-        return ExternalWebServiceContextFactory.class.isAssignableFrom(targetType);
-    }
+public class ExternalWebServiceWireBuilder extends WireBuilderSupport<ExternalWebServiceContextFactory> {
 
     protected TargetInvoker createInvoker(QualifiedName targetName, Method operation,
                                           ScopeContext context, boolean downScope) {

Modified: incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/WebServiceEntryPointBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/WebServiceEntryPointBuilder.java?rev=398829&r1=398828&r2=398829&view=diff
==============================================================================
--- incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/WebServiceEntryPointBuilder.java (original)
+++ incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/WebServiceEntryPointBuilder.java Mon May  1 23:50:19 2006
@@ -19,7 +19,6 @@
 import org.apache.tuscany.core.builder.impl.EntryPointContextFactory;
 import org.apache.tuscany.core.extension.EntryPointBuilderSupport;
 import org.apache.tuscany.core.message.MessageFactory;
-import org.apache.tuscany.model.assembly.Binding;
 import org.apache.tuscany.model.assembly.EntryPoint;
 import org.osoa.sca.annotations.Scope;
 
@@ -29,11 +28,7 @@
  * @version $Rev$ $Date$
  */
 @Scope("MODULE")
-public class WebServiceEntryPointBuilder extends EntryPointBuilderSupport {
-
-    protected boolean handlesBindingType(Binding binding) {
-        return binding instanceof WebServiceBinding;
-    }
+public class WebServiceEntryPointBuilder extends EntryPointBuilderSupport<WebServiceBinding> {
 
     protected EntryPointContextFactory createEntryPointContextFactory(EntryPoint entryPoint,
                                                                       MessageFactory msgFactory) {