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;
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.
*/
* 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;
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);