X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fspring%2FRequiredServiceBean.java;h=abd5115ea68ab78384175e974280d43fa606fdee;hb=2d1fd76ec884b5fc7be4078020fdf14d17166e8a;hp=95e2e786628d6b6638ef98524053ca6668501268;hpb=6f8bb575523e672b9f8797e543f7c59d15db7253;p=utils

diff --git a/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java b/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java
index 95e2e786..abd5115e 100644
--- a/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java
+++ b/system/spring/src/main/java/org/wamblee/system/spring/RequiredServiceBean.java
@@ -16,9 +16,10 @@
 package org.wamblee.system.spring;
 
 import org.springframework.beans.factory.FactoryBean;
-import org.wamblee.system.ProvidedInterface;
-import org.wamblee.system.RequiredInterface;
-import org.wamblee.system.SystemAssemblyException;
+import org.wamblee.system.core.ProvidedInterface;
+import org.wamblee.system.core.RequiredInterface;
+import org.wamblee.system.core.RequiredInterfaces;
+import org.wamblee.system.core.SystemAssemblyException;
 
 /**
  * Bean which adds a service required by the spring component to 
@@ -35,19 +36,20 @@ class RequiredServiceBean implements FactoryBean {
 	 * @param aId Id of the bean in the service registry.  
 	 */
 	public RequiredServiceBean(String aId) { 
-		RequiredInterface[] required = SpringComponent.THIS.get().getRequiredServices();
+		RequiredInterfaces required = SpringComponent.THIS.get().getRequiredInterfaces();
 		for ( RequiredInterface intf: required) { 
 			if ( intf.getName().equals(aId)) { 
 				_required = intf; 
 				return;
 			}
 		}
-		throw new SystemAssemblyException("Cannot resolve provided component '" + aId + "'");
+		throw new SystemAssemblyException("Cannot resolve required component '" + aId + "'");
 	}
 
 	@Override
 	public Object getObject() throws Exception {
-		return _required.getImplementation(Object.class);
+		return SpringComponent.SCOPE.get().getInterfaceImplementation(
+				_required.getProvider(), Object.class);
 	}
 
 	@Override