X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fspring%2FSpringComponent.java;h=1da30a324ed53c4c9812306669e2adc287b5b6a8;hb=d67a117843d23eaf7b44f5c048d3fdee9310b2a1;hp=aea9b15aa1a548eacfe9e7c1a39667f684606003;hpb=dea786c9d49228a37cb5fd5b4113b86d9f6cddbf;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 aea9b15a..1da30a32 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 @@ -94,10 +94,6 @@ public class SpringComponent extends AbstractComponent { setProperty((String) key, aProperties.getProperty((String) key)); } } - - public Scope start() { - return super.start(new DefaultScope(new ProvidedInterface[0])); - } @Override protected Scope doStart(Scope aExternalScope) { @@ -113,20 +109,22 @@ public class SpringComponent extends AbstractComponent { registerRequiredServices(parentContext); parentContext.refresh(); - + + System.out.println("Parent context " + parentContext); + AbstractApplicationContext context = parseConfigFiles(parentContext); context .addBeanFactoryPostProcessor(new PropertySetter(_properties)); context.refresh(); - exposeProvidedServices(context, scope); + exposeProvidedServices(context, aExternalScope); scope.put(CONTEXT_KEY, context); return scope; } catch (Exception e) { throw new SystemAssemblyException( - "Failed to assemble spring system", e); + "Failed to assemble spring system " + getName(), e); } finally { THIS.set(old); SCOPE.set(oldScope); @@ -144,7 +142,6 @@ public class SpringComponent extends AbstractComponent { } addInterface(_provided.get(name), svc, aScope); System.out.println("addService " + _provided.get(name) + " " + svc); - aScope.publishInterface(_provided.get(name), svc); } } @@ -152,7 +149,7 @@ public class SpringComponent extends AbstractComponent { // Parse spring config files return new ClassPathXmlApplicationContext((String[]) _configFiles, - aParentContext); + false, aParentContext); } private void registerRequiredServices(GenericApplicationContext aParentContext) {