X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=system%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fspring%2FRequiredServiceBean.java;h=71ac30857c59c3181cc69cd2cb2c144b27dfe154;hb=fb16323ec164acd234dc489923f97a7419fcfa8e;hp=50e7e967998ef4e3b098b9516cad92b3980ab593;hpb=6a914dcbd1c89027eafae6021af4199a636e4e48;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 50e7e967..71ac3085 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,9 +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 java.util.List;
+
 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.RequiredInterface;
+import org.wamblee.system.core.SystemAssemblyException;
 
 /**
  * Bean which adds a service required by the spring component to 
@@ -20,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();
+		List<RequiredInterface> 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