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=eaf55336c185f74afc0d72de41a0da54cc3afdfb;hpb=d2bdf4e813c6a3964958c87b2ce56eaadf8a1f0a;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 eaf55336..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
@@ -1,6 +1,25 @@
+/*
+ * Copyright 2007 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ 
 package org.wamblee.system.spring;
 
 import org.springframework.beans.factory.FactoryBean;
+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 
@@ -10,19 +29,27 @@ import org.springframework.beans.factory.FactoryBean;
  */
 class RequiredServiceBean implements FactoryBean {
 	
-	private String _id;
+	private RequiredInterface _required; 
 	
 	/**
 	 * Constructs the bean. 
 	 * @param aId Id of the bean in the service registry.  
 	 */
 	public RequiredServiceBean(String aId) { 
-		_id = aId; 
+		RequiredInterfaces required = SpringComponent.THIS.get().getRequiredInterfaces();
+		for ( RequiredInterface intf: required) { 
+			if ( intf.getName().equals(aId)) { 
+				_required = intf; 
+				return;
+			}
+		}
+		throw new SystemAssemblyException("Cannot resolve required component '" + aId + "'");
 	}
 
 	@Override
 	public Object getObject() throws Exception {
-		return SpringComponent.REGISTRY.get().find(_id).reference(Object.class);
+		return SpringComponent.SCOPE.get().getInterfaceImplementation(
+				_required.getProvider(), Object.class);
 	}
 
 	@Override