(no commit message)

[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 36b50e78f38db31b22993386daf00e9024a91f81..8d50bf280d53b6d09f562519cbecdc20c9526e11 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
@@ -135,7 +135,7 @@ public class SpringComponent extends AbstractComponent {
                                throw new IllegalArgumentException(getQualifiedName() + ": service '"
                                                + name + "' is null");
                        }
-                       addService(_provided.get(name), svc);
+                       addInterface(_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());
@@ -162,5 +162,8 @@ public class SpringComponent extends AbstractComponent {
        @Override
        protected void doStop() {
                _context.close();
+           for (ProvidedInterface provided: getProvidedInterfaces()) { 
+               removeInterface(provided);
+           }
        }
 }