rename service to interface.

[utils] / system / spring / src / main / java / org / wamblee / system / spring / SpringComponent.java

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 763875f6072f770df99312748e120c9bb2b34f44..09ef341175657aae0e7da781a6299c2b5cf0a95e 100644 (file)
--- a/system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java
+++ b/system/spring/src/main/java/org/wamblee/system/spring/SpringComponent.java
@@ -25,10 +25,10 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
 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.ProvidedInterface;
-import org.wamblee.system.RequiredInterface;
-import org.wamblee.system.SystemAssemblyException;
+import org.wamblee.system.core.AbstractComponent;
+import org.wamblee.system.core.ProvidedInterface;
+import org.wamblee.system.core.RequiredInterface;
+import org.wamblee.system.core.SystemAssemblyException;
 
 /**
  * Represents a system configured based on spring. The spring config files that
@@ -100,7 +100,7 @@ public class SpringComponent extends AbstractComponent {
        }
 
        @Override
-       protected void doStart(String aContext) {
+       protected void doStart() {
 
                SpringComponent old = THIS.get();
                THIS.set(this);
@@ -117,7 +117,7 @@ public class SpringComponent extends AbstractComponent {
                                        .addBeanFactoryPostProcessor(new PropertySetter(_properties));
                        _context.refresh();
 
-                       exposeProvidedServices(aContext);
+                       exposeProvidedServices();
                } catch (Exception e) {
                        throw new SystemAssemblyException(
                                        "Failed to assemble spring system", e);
@@ -126,16 +126,16 @@ public class SpringComponent extends AbstractComponent {
                }
        }
 
-       private void exposeProvidedServices(String aContext) {
+       private void exposeProvidedServices() {
                // Call addService for each provided service.
 
                for (String name : _provided.keySet()) {
                        Object svc = _context.getBean(name);
                        if (svc == null) {
-                               throw new IllegalArgumentException(aContext + ": service '"
+                               throw new IllegalArgumentException(getQualifiedName() + ": service '"
                                                + name + "' is null");
                        }
-                       addService(aContext, _provided.get(name), svc);
+                       addService(_provided.get(name), svc);
                }
        }
 
@@ -148,7 +148,7 @@ public class SpringComponent extends AbstractComponent {
 
        private void registerRequiredServices() {
                // Register required services in a parent context
-               for (RequiredInterface required: getRequiredServices()) { 
+               for (RequiredInterface required: getRequiredInterfaces()) { 
                        String beanName = _required.get(required);
                        ConstructorArgumentValues cargs = new ConstructorArgumentValues();
                        cargs.addGenericArgumentValue(required.getName());