X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fspring%2FSpringComponent.java;h=b9a2648c7ca706838795538637e0c0d584aa3271;hb=0af4854898104bd6322c0f22feb6dc285859f420;hp=a5dd685d4d6074be65811bac4dd3f1197956edfb;hpb=cc58fc5b498c82163904e8ccdc5eed7b96406a65;p=utils

diff --git a/system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java b/system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java
index a5dd685d..b9a2648c 100644
--- a/system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java
+++ b/system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java
@@ -11,8 +11,8 @@ import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.wamblee.system.AbstractComponent;
-import org.wamblee.system.ProvidedInterfaceDescriptor;
-import org.wamblee.system.RequiredInterfaceDescriptor;
+import org.wamblee.system.ProvidedInterface;
+import org.wamblee.system.RequiredInterface;
 import org.wamblee.system.Service;
 import org.wamblee.system.ServiceRegistry;
 import org.wamblee.system.SystemAssembler;
@@ -34,8 +34,8 @@ public class SpringComponent extends AbstractComponent {
 
 	private Properties _properties; 
 	private String[] _configFiles;
-	private Map<String, ProvidedInterfaceDescriptor> _provided;
-	private Map<RequiredInterfaceDescriptor, String> _required;
+	private Map<String, ProvidedInterface> _provided;
+	private Map<RequiredInterface, String> _required;
 	/**
 	 * Parent application context containing required services.
 	 */
@@ -63,10 +63,10 @@ public class SpringComponent extends AbstractComponent {
 	 *            service.
 	 */
 	public SpringComponent(String aName, ServiceRegistry aRegistry, String[] aConfigFiles,
-			Map<String, ProvidedInterfaceDescriptor> aProvided,
-			Map<RequiredInterfaceDescriptor, String> aRequired) {
-		super(aName, aRegistry, aProvided.values().toArray(new ProvidedInterfaceDescriptor[0]),
-				aRequired.keySet().toArray(new RequiredInterfaceDescriptor[0]));
+			Map<String, ProvidedInterface> aProvided,
+			Map<RequiredInterface, String> aRequired) {
+		super(aName, aRegistry, aProvided.values().toArray(new ProvidedInterface[0]),
+				aRequired.keySet().toArray(new RequiredInterface[0]));
 		_properties = new Properties(); 
 		_configFiles = aConfigFiles;
 		_provided = aProvided;
@@ -141,10 +141,10 @@ public class SpringComponent extends AbstractComponent {
 
 		for (Service svc: aRequiredServices) { 
 			String id = svc.getId();
-			ProvidedInterfaceDescriptor descriptor = svc.getDescriptor();
-			RequiredInterfaceDescriptor[] requiredServices = SystemAssembler.filterRequiredServices(descriptor,
+			ProvidedInterface descriptor = svc.getDescriptor();
+			RequiredInterface[] requiredServices = SystemAssembler.filterRequiredServices(descriptor,
 					_required.keySet()); 
-			for (RequiredInterfaceDescriptor required: requiredServices) { 
+			for (RequiredInterface required: requiredServices) { 
 				String beanName = _required.get(required);
 				ConstructorArgumentValues cargs = new ConstructorArgumentValues();
 				cargs.addGenericArgumentValue(id);