You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/12/08 16:52:30 UTC

svn commit: r1043464 - /tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java

Author: antelder
Date: Wed Dec  8 15:52:30 2010
New Revision: 1043464

URL: http://svn.apache.org/viewvc?rev=1043464&view=rev
Log:
Update EndpointReferenceBinder with a plug point for an UnknownEndpointHandler thats called when an endpoint isn't found in the registry. Don't know if this is the best approach yet but it gives something to try with itests too see how it works

Modified:
    tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java

Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java?rev=1043464&r1=1043463&r2=1043464&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java Wed Dec  8 15:52:30 2010
@@ -42,6 +42,7 @@ import org.apache.tuscany.sca.assembly.b
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.core.assembly.impl.RuntimeEndpointImpl;
 import org.apache.tuscany.sca.core.assembly.impl.RuntimeEndpointReferenceImpl;
 import org.apache.tuscany.sca.definitions.Definitions;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
@@ -62,6 +63,7 @@ import org.apache.tuscany.sca.runtime.En
 import org.apache.tuscany.sca.runtime.EndpointRegistry;
 import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
 import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
+import org.apache.tuscany.sca.runtime.UnknownEndpointHandler;
 import org.oasisopen.sca.ServiceRuntimeException;
 
 /**
@@ -83,6 +85,7 @@ public class EndpointReferenceBinderImpl
     protected BuilderExtensionPoint builders;
     protected CompositeActivator compositeActivator;
     protected Monitor monitor;
+    protected UnknownEndpointHandler unknownEndpointHandler;
 
 
     public EndpointReferenceBinderImpl(ExtensionPointRegistry extensionPoints) {
@@ -96,6 +99,8 @@ public class EndpointReferenceBinderImpl
         
         MonitorFactory monitorFactory = utils.getUtility(MonitorFactory.class);
         monitor = monitorFactory.createMonitor();
+
+        this.unknownEndpointHandler = utils.getUtility(UnknownEndpointHandler.class);
         
         this.builders = extensionPoints.getExtensionPoint(BuilderExtensionPoint.class);
         this.compositeActivator = extensionPoints.getExtensionPoint(CompositeActivator.class);
@@ -274,13 +279,29 @@ public class EndpointReferenceBinderImpl
                     endpointReference.getTargetEndpoint().setBinding(endpointReference.getBinding());
                     endpointReference.setStatus(EndpointReference.Status.RESOLVED_BINDING);
                 } else {
-                    Monitor.error(monitor, 
-                                  this, 
-                                  "endpoint-validation-messages", 
-                                  "NoEndpointsFound", 
-                                  endpointReference.toString()); 
-                    throw new ServiceRuntimeException("Unable to bind " + 
-                                                      monitor.getLastProblem().toString());
+                    Binding b = null;
+                    if (unknownEndpointHandler != null) {
+                        b = unknownEndpointHandler.handleUnknownEndpoint(endpointReference);
+                    }
+                    if (b != null) {
+                        Endpoint matchedEndpoint = new RuntimeEndpointImpl(extensionPoints);
+                        matchedEndpoint.setBinding(b);
+                        matchedEndpoint.setRemote(true);
+                        endpointReference.setTargetEndpoint(matchedEndpoint);
+                        endpointReference.setBinding(b);
+                        endpointReference.setUnresolved(false);
+                        endpointReference.setStatus(EndpointReference.Status.WIRED_TARGET_FOUND_AND_MATCHED);
+                        matchAudit.append("Match because the UnknownEndpointHandler provided a binding: " + b.getType() + " uri: " + b.getURI());
+                        matchAudit.appendSeperator();
+                    } else {
+                        Monitor.error(monitor, 
+                                      this, 
+                                      "endpoint-validation-messages", 
+                                      "NoEndpointsFound", 
+                                      endpointReference.toString()); 
+                        throw new ServiceRuntimeException("Unable to bind " + 
+                                                          monitor.getLastProblem().toString());
+                    }
                 }
             }             
         }