X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcontainer%2FContainer.java;h=9669cb216dd65a28e0f75670e3f0a9d106b2efb0;hb=e1975449f1bf16ccb441632d68e440f3e3704a79;hp=9ef2ae18d817a0e35f8fda0c20c525a29d08775e;hpb=b8c91461116e84e47d5a9aa5047d8babfc8dfa03;p=utils

diff --git a/system/general/src/main/java/org/wamblee/system/container/Container.java b/system/general/src/main/java/org/wamblee/system/container/Container.java
index 9ef2ae18..9669cb21 100644
--- a/system/general/src/main/java/org/wamblee/system/container/Container.java
+++ b/system/general/src/main/java/org/wamblee/system/container/Container.java
@@ -17,9 +17,7 @@ package org.wamblee.system.container;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -160,14 +158,50 @@ public class Container extends AbstractComponent<Scope> {
     public void connectExternalRequired(String aComponent, String aRequiredInterface, 
             String aExternalRequiredInterface) {
         checkSealed();
-        // TODO validate
+        Component client = findComponent(aComponent);
+        if ( client == null ) { 
+        	throw new SystemAssemblyException(getQualifiedName() + ": No component '" + aComponent + "' in the container");
+        }
+        if ( aRequiredInterface != null ) { 
+        	if ( findInterface(client.getRequiredInterfaces(), aRequiredInterface) == null ) { 
+        		throw new SystemAssemblyException(
+        				getQualifiedName() + ": Component '" + aComponent + "' does not have a required interface named '" 
+        				+ aRequiredInterface + "'");
+        	}
+        }
+        if ( aExternalRequiredInterface != null) { 
+        	if ( findInterface(getRequiredInterfaces(), aExternalRequiredInterface) == null ) { 
+        		throw new SystemAssemblyException(
+        				getQualifiedName() + ": container does not have a required interface named '" 
+        				+ aExternalRequiredInterface + "'");
+        	}
+        }
         _edgeFilter.add(new ConnectRequiredExternallyRequiredEdgeFilter(
                 aComponent, aRequiredInterface, aExternalRequiredInterface));
     }
     
     public void connectExternalProvided(String aExternalProvided, String aComponent, String aProvidedInterface) {
         checkSealed();
-        // TODO validate
+        Component server = findComponent(aComponent);
+       
+      
+        if ( server == null ) { 
+        	throw new SystemAssemblyException("No component '" + aComponent + "' in the container");
+        }
+        if ( aProvidedInterface != null ) { 
+        	if ( findInterface(server.getProvidedInterfaces(), aProvidedInterface) == null) { 
+        		throw new SystemAssemblyException(
+        				getQualifiedName() + ": Component '" + aComponent + "' does not have a provided interface named '" 
+        				+ aProvidedInterface + "'");
+        	}
+        }
+        if ( aExternalProvided != null ) { 
+        	if ( findInterface(getProvidedInterfaces(), aExternalProvided) == null) { 
+        		throw new SystemAssemblyException(
+        				getQualifiedName() + ": Container does not have a provided interface named '" 
+        				+ aExternalProvided + "'");
+        	}
+        }
         _edgeFilter.add(new ConnectExternalProvidedProvidedFilter(aExternalProvided, aComponent, aProvidedInterface));
     }
 
@@ -237,7 +271,6 @@ public class Container extends AbstractComponent<Scope> {
 
     @Override
     protected Scope doStart(Scope aExternalScope) {
-        checkSealed();
         validate();
         Scope scope = new DefaultScope(getProvidedInterfaces().toArray(new ProvidedInterface[0]), aExternalScope);
         ComponentGraph graph = doStartOptionalDryRun(scope, false);
@@ -258,9 +291,7 @@ public class Container extends AbstractComponent<Scope> {
     private ComponentGraph doStartOptionalDryRun(Scope aScope, boolean aDryRun) {
         ComponentGraph graph = createComponentGraph();
         graph.validate();
-        if (!aDryRun) {
-            graph.link();
-        }
+        graph.link();
 
         LOG.info("Starting '" + getQualifiedName() + "'");